summaryrefslogtreecommitdiff
path: root/numpy/ma
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2010-02-21 02:53:10 +0000
committerPauli Virtanen <pav@iki.fi>2010-02-21 02:53:10 +0000
commiteac637ec20fa18762da0a7961065f30bf5b2e328 (patch)
treef6827daec012a99769f76598c69917aab5c692c2 /numpy/ma
parent79430a42f67c579bc69aa375237201d2dde7c636 (diff)
downloadnumpy-eac637ec20fa18762da0a7961065f30bf5b2e328.tar.gz
BUG: ma: fix inoperative error state set/restore
Diffstat (limited to 'numpy/ma')
-rw-r--r--numpy/ma/core.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py
index f6d2d1e6a..3047618ad 100644
--- a/numpy/ma/core.py
+++ b/numpy/ma/core.py
@@ -1057,9 +1057,6 @@ class _DomainedBinaryOperation:
# Get the data and the mask
(da, db) = (getdata(a, subok=False), getdata(b, subok=False))
(ma, mb) = (getmask(a), getmask(b))
- # Save the current error status
- err_status_ini = np.geterr()
- np.seterr(divide='ignore', invalid='ignore')
# Get the result
err_status_ini = np.geterr()
try:
@@ -1067,8 +1064,6 @@ class _DomainedBinaryOperation:
result = self.f(da, db, *args, **kwargs)
finally:
np.seterr(**err_status_ini)
- # Reset the error status
- np.seterr(**err_status_ini)
# Get the mask as a combination of ma, mb and invalid
m = ~umath.isfinite(result)
m |= ma