Improve argument checking for set_xticks().

anntzer · anntzer · commit df3d2ab53722 · 2022-11-29T15:46:07.000+01:00
diff --git a/lib/matplotlib/_api/__init__.py b/lib/matplotlib/_api/__init__.py
@@ -162,6 +162,8 @@ def check_shape(_shape, **kwargs):
                                     if n is not None
                                     else next(dim_labels)
                                     for n in target_shape))
+            if len(target_shape) == 1:
+                text_shape += ","
 
             raise ValueError(
                 f"{k!r} must be {len(target_shape)}D "
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -2046,6 +2046,7 @@ def _set_tick_locations(self, ticks, *, minor=False):
 
         # XXX if the user changes units, the information will be lost here
         ticks = self.convert_units(ticks)
+        locator = mticker.FixedLocator(ticks)  # validate ticks early.
         for name, axis in self.axes._axis_map.items():
             if self is axis:
                 shared = [
@@ -2061,10 +2062,10 @@ def _set_tick_locations(self, ticks, *, minor=False):
                 axis.set_view_interval(min(ticks), max(ticks))
         self.axes.stale = True
         if minor:
-            self.set_minor_locator(mticker.FixedLocator(ticks))
+            self.set_minor_locator(locator)
             return self.get_minor_ticks(len(ticks))
         else:
-            self.set_major_locator(mticker.FixedLocator(ticks))
+            self.set_major_locator(locator)
             return self.get_major_ticks(len(ticks))
 
     def set_ticks(self, ticks, labels=None, *, minor=False, **kwargs):
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5788,13 +5788,18 @@ def test_set_ticks_with_labels(fig_test, fig_ref):
     ax.set_yticks([2, 4], ['A', 'B'], minor=True)
 
 
-def test_set_noniterable_ticklabels():
-    # Ensure a useful TypeError message is raised
-    # when given a non-iterable ticklabels argument
-    # Pull request #22710
+def test_xticks_bad_args():
+    ax = plt.figure().add_subplot()
     with pytest.raises(TypeError, match='must be a sequence'):
-        fig, ax = plt.subplots(2)
-        ax[1].set_xticks([2, 9], 3.1)
+        ax.set_xticks([2, 9], 3.1)
+    with pytest.raises(ValueError, match='must be 1D'):
+        plt.xticks(np.arange(4).reshape((-1, 1)))
+    with pytest.raises(ValueError, match='must be 1D'):
+        plt.xticks(np.arange(4).reshape((1, -1)))
+    with pytest.raises(ValueError, match='must be 1D'):
+        plt.xticks(np.arange(4).reshape((-1, 1)), labels=range(4))
+    with pytest.raises(ValueError, match='must be 1D'):
+        plt.xticks(np.arange(4).reshape((1, -1)), labels=range(4))
 
 
 def test_subsampled_ticklabels():
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1718,6 +1718,7 @@ class FixedLocator(Locator):
 
     def __init__(self, locs, nbins=None):
         self.locs = np.asarray(locs)
+        _api.check_shape((None,), locs=self.locs)
         self.nbins = max(nbins, 2) if nbins is not None else None
 
     def set_params(self, nbins=None):
