MAINT: Change the type of error raised in set_printoptions

kianasun · kianasun · commit 55a8193db553 · 2019-07-25T09:15:31.000-07:00
diff --git a/changelog/13899.changes.rst b/changelog/13899.changes.rst
@@ -0,0 +1,4 @@
+Incorrect ``threshold`` in ``np.set_printoptions`` raises ``TypeError`` or ``ValueError``
+-----------------------------------------------------------------------------------------
+Previously, an incorrect ``threshold`` raises ``ValueError``, it now raises ``TypeError``
+for non-numeric types and ``ValueError`` for ``nan`` values.
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
@@ -89,8 +89,10 @@ def _make_options_dict(precision=None, threshold=None, edgeitems=None,
                       "`False`", stacklevel=3)
     if threshold is not None:
         # forbid the bad threshold arg suggested by stack overflow, gh-12351
-        if not isinstance(threshold, numbers.Number) or np.isnan(threshold):
-            raise ValueError("threshold must be numeric and non-NAN, try "
+        if not isinstance(threshold, numbers.Number):
+            raise TypeError("threshold must be numeric")
+        if np.isnan(threshold):
+            raise ValueError("threshold must be non-NAN, try "
                              "sys.maxsize for untruncated representation")
     return options
 
diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py
@@ -847,9 +847,9 @@ def test_edgeitems(self):
         )
 
     def test_bad_args(self):
-        assert_raises(ValueError, np.set_printoptions, threshold='nan')
-        assert_raises(ValueError, np.set_printoptions, threshold=u'1')
-        assert_raises(ValueError, np.set_printoptions, threshold=b'1')
+        assert_raises(ValueError, np.set_printoptions, threshold=float('nan'))
+        assert_raises(TypeError, np.set_printoptions, threshold='1')
+        assert_raises(TypeError, np.set_printoptions, threshold=b'1')
 
 def test_unicode_object_array():
     import sys
