summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-02-22 09:40:47 -0700
committerCharles Harris <charlesr.harris@gmail.com>2014-02-22 09:40:47 -0700
commitd2fd1af156ac095156d3fbf833392b644e61c226 (patch)
treebd7d125716594d0af05a66212148c4cb6f2fc1f8
parent65a73df664ff5ac9da942b2d8f8b2737867ca82a (diff)
parent5803ec43faf46d5117ddddfc7026f098ea5b3b89 (diff)
downloadnumpy-d2fd1af156ac095156d3fbf833392b644e61c226.tar.gz
Merge pull request #4288 from nh2/fix-seterr-examples
Mistake in seterr docs?
-rw-r--r--numpy/core/numeric.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 3b8e52e71..5f4553284 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -2409,7 +2409,7 @@ def seterr(all=None, divide=None, over=None, under=None, invalid=None):
>>> np.seterr(over='raise')
{'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore',
'under': 'ignore'}
- >>> np.seterr(all='ignore') # reset to default
+ >>> np.seterr(**old_settings) # reset to default
{'over': 'raise', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'}
>>> np.int16(32000) * np.int16(3)