diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-13 14:14:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 14:14:49 -0700 |
| commit | 3fe2d9d2627fc0f84aeed293ff8afa7c1f08d899 (patch) | |
| tree | 2ea27fe06a19c39e8d7a5fe2f87cb7e05363247d /numpy/core/shape_base.py | |
| parent | 7d7e446fcbeeff70d905bde2eb0264a797488280 (diff) | |
| parent | eff302e5e8678fa17fb3d8156d49eb585b0876d9 (diff) | |
| download | numpy-3fe2d9d2627fc0f84aeed293ff8afa7c1f08d899.tar.gz | |
Merge branch 'master' into fix-issue-10244
Diffstat (limited to 'numpy/core/shape_base.py')
| -rw-r--r-- | numpy/core/shape_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/shape_base.py b/numpy/core/shape_base.py index 7a76bbf9d..e4dc30d4c 100644 --- a/numpy/core/shape_base.py +++ b/numpy/core/shape_base.py @@ -539,7 +539,8 @@ def _accumulate(values): def _concatenate_shapes(shapes, axis): """Given array shapes, return the resulting shape and slices prefixes. - These help in nested concatation. + These help in nested concatenation. + Returns ------- shape: tuple of int |