diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-12-18 21:22:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 21:22:42 -0800 |
| commit | abb9bb52d9e09780a6519c42a2900f83a4bdc557 (patch) | |
| tree | f9a626c4eb7dd58b23dd454b03bd7cead8e54bbb /numpy/lib/tests | |
| parent | 34c9950ccdb8a2f64916903b09c2c39233be0adf (diff) | |
| parent | 0f13a2e7fa626dbde62bdda7a92fc0a6361981ba (diff) | |
| download | numpy-abb9bb52d9e09780a6519c42a2900f83a4bdc557.tar.gz | |
Merge branch 'master' into move_histogram
Diffstat (limited to 'numpy/lib/tests')
| -rw-r--r-- | numpy/lib/tests/test_index_tricks.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index 1d5efef86..b5e06dad0 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -216,6 +216,11 @@ class TestConcatenator(object): assert_equal(actual, expected) assert_equal(type(actual), type(expected)) + def test_0d(self): + assert_equal(r_[0, np.array(1), 2], [0, 1, 2]) + assert_equal(r_[[0, 1, 2], np.array(3)], [0, 1, 2, 3]) + assert_equal(r_[np.array(0), [1, 2, 3]], [0, 1, 2, 3]) + class TestNdenumerate(object): def test_basic(self): |