diff options
| author | Jamie Townsend <jamiehntownsend@gmail.com> | 2017-09-25 11:41:12 +0100 |
|---|---|---|
| committer | Jamie Townsend <jamiehntownsend@gmail.com> | 2017-09-25 11:41:12 +0100 |
| commit | 3ed6936b82cb444e5516bda705701245d4fa4b4d (patch) | |
| tree | 6e403de04e0fff9b1e29ae9f4caf44ea0cc3e045 /numpy/core/shape_base.py | |
| parent | ffa6cf66b03dab41ae843f3b8117a279fb2ef5c2 (diff) | |
| download | numpy-3ed6936b82cb444e5516bda705701245d4fa4b4d.tar.gz | |
Simplify further - matching docstring logic
Diffstat (limited to 'numpy/core/shape_base.py')
| -rw-r--r-- | numpy/core/shape_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index 306754a59..95cda658d 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -436,7 +436,7 @@ def _block(arrays, list_ndim): arrs = [block_recursion(arr, depth+1) for arr in arrays] arr_ndim = max(arr.ndim for arr in arrs) arrs = [atleast_nd(a, arr_ndim) for a in arrs] - return _nx.concatenate(arrs, axis=depth+max(0, arr_ndim-list_ndim)) + return _nx.concatenate(arrs, axis=depth-list_ndim) else: # We've 'bottomed out' - arrays is either a scalar or an array return atleast_nd(arrays, list_ndim) |