summaryrefslogtreecommitdiff
path: root/numpy/core/memmap.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-06-11 12:45:49 -0600
committerGitHub <noreply@github.com>2018-06-11 12:45:49 -0600
commit2f381fedddfec79f1c059c1b1ecc466593ecd691 (patch)
tree9693e53e2332ac68b281131fa39040ccce0afeca /numpy/core/memmap.py
parent1b920805704095fde1b8f6ad7ff81a62f5176dd6 (diff)
parentb4e10f096f8c2c345de74a8713afd8cadc7930a9 (diff)
downloadnumpy-2f381fedddfec79f1c059c1b1ecc466593ecd691.tar.gz
Merge pull request #11307 from pgunn/master_fix_earlier_diff
BUG: Fix memmap regression when shape=None
Diffstat (limited to 'numpy/core/memmap.py')
-rw-r--r--numpy/core/memmap.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/numpy/core/memmap.py b/numpy/core/memmap.py
index b2ff0e793..536fa6094 100644
--- a/numpy/core/memmap.py
+++ b/numpy/core/memmap.py
@@ -236,6 +236,7 @@ class memmap(ndarray):
raise ValueError("Size of available data is not a "
"multiple of the data-type size.")
size = bytes // _dbytes
+ shape = (size,)
else:
if not isinstance(shape, tuple):
shape = (shape,)