summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorpierregm <pierregm@localhost>2010-02-14 23:04:18 +0000
committerpierregm <pierregm@localhost>2010-02-14 23:04:18 +0000
commit29efc30b7b2290abf7c6d4d5eeddd5a97502098a (patch)
treea7971a85fcc35faa217cab0a3326d2219dba0633 /numpy/ma
parentf45d580284a5cbb96277733ced149c4e7b7d3244 (diff)
downloadnumpy-29efc30b7b2290abf7c6d4d5eeddd5a97502098a.tar.gz
Fix #1367 (round 2)
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index 09710a1a9..939f84f84 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -2875,7 +2875,7 @@ class MaskedArray(ndarray):
# Try to reset the shape of the mask (if we don't have a void)
try:
output._mask.shape = output.shape
- except AttributeError:
+ except (AttributeError, TypeError):
pass
# Make sure to reset the _fill_value if needed
if getattr(output, '_fill_value', None):