Merge pull request #12860 from jor-/LogLocator-subs

anntzer · web-flow · commit cf45de859c3d · 2019-08-25T12:11:02.000+02:00
ENH: LogLocator: check for correct dimension of subs added
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -1260,3 +1260,12 @@ def test_remove_overlap(remove_overlapping_locs, expected_num):
     assert len(ax.xaxis.get_minor_ticks()) == expected_num
     assert len(ax.xaxis.get_minorticklabels()) == expected_num
     assert len(ax.xaxis.get_minorticklines()) == expected_num*2
+
+
+@pytest.mark.parametrize('sub', [
+    ['hi', 'aardvark'],
+    np.zeros((2, 2))])
+def test_bad_locator_subs(sub):
+    ll = mticker.LogLocator()
+    with pytest.raises(ValueError):
+        ll.subs(sub)
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -2382,7 +2382,16 @@ def subs(self, subs):
             cbook._check_in_list(('all', 'auto'), subs=subs)
             self._subs = subs
         else:
-            self._subs = np.asarray(subs, dtype=float)
+            try:
+                self._subs = np.asarray(subs, dtype=float)
+            except ValueError as e:
+                raise ValueError("subs must be None, 'all', 'auto' or "
+                                 "a sequence of floats, not "
+                                 "{}.".format(subs)) from e
+            if self._subs.ndim != 1:
+                raise ValueError("A sequence passed to subs must be "
+                                 "1-dimensional, not "
+                                 "{}-dimensional.".format(self._subs.ndim))
 
     def __call__(self):
         'Return the locations of the ticks'
