Expire remaining features deprecated in mpl2.2.

anntzer · anntzer · commit 411ea35b5c79 · 2020-01-11T12:10:51.000+01:00
diff --git a/doc/api/next_api_changes/behaviour.rst b/doc/api/next_api_changes/behaviour.rst
@@ -62,3 +62,17 @@ property.  This now raises a TypeError.
 `.FileMovieWriter` now defaults to writing temporary frames in a temporary
 directory, which is always cleared at exit.  In order to keep the individual
 frames saved on the filesystem, pass an explicit *frame_prefix*.
+
+Animations whose len() cannot be determined are no longer truncated to 100 frames when saved
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Instead, the underlying iterable will be consumed until it terminates.  Beware:
+attempting to save an animation whose underlying iterable is infinite will lead
+to an infinite loop!
+
+`.Axes.plot` no longer accepts *x* and *y* being both 2D and with different numbers of columns
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Previously, calling `.Axes.plot` e.g. with *x* of shape ``(n, 3)`` and *y* of
+shape ``(n, 2)`` would plot the first column of *x* against the first column
+of *y*, the second column of *x* against the second column of *y*, **and** the
+first column of *x* against the third column of *y*.  This now raises an error
+instead.
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -1666,10 +1666,7 @@ def iter_frames(frames=frames):
             self._iter_gen = lambda: iter(range(frames))
             self.save_count = frames
 
-        if self.save_count is None:
-            # If we're passed in and using the default, set save_count to 100.
-            self.save_count = 100
-        else:
+        if self.save_count is not None:
             # itertools.islice returns an error when passed a numpy int instead
             # of a native python int (http://bugs.python.org/issue30537).
             # As a workaround, convert save_count to a native python int.
@@ -1700,26 +1697,7 @@ def new_saved_frame_seq(self):
             self._old_saved_seq = list(self._save_seq)
             return iter(self._old_saved_seq)
         else:
-            if self.save_count is not None:
-                return itertools.islice(self.new_frame_seq(), self.save_count)
-
-            else:
-                frame_seq = self.new_frame_seq()
-
-                def gen():
-                    try:
-                        for _ in range(100):
-                            yield next(frame_seq)
-                    except StopIteration:
-                        pass
-                    else:
-                        cbook.warn_deprecated(
-                            "2.2", message="FuncAnimation.save has truncated "
-                            "your animation to 100 frames.  In the future, no "
-                            "such truncation will occur; please pass "
-                            "'save_count' accordingly.")
-
-                return gen()
+            return itertools.islice(self.new_frame_seq(), self.save_count)
 
     def _init_draw(self):
         # Initialize the drawing either using the given init_func or by
@@ -1746,7 +1724,8 @@ def _draw_frame(self, framedata):
 
         # Make sure to respect save_count (keep only the last save_count
         # around)
-        self._save_seq = self._save_seq[-self.save_count:]
+        if self.save_count is not None:
+            self._save_seq = self._save_seq[-self.save_count:]
 
         # Call the func with framedata and args. If blitting is desired,
         # func needs to return a sequence of any artists that were modified.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -356,9 +356,7 @@ def _plot_args(self, tup, kwargs):
 
         ncx, ncy = x.shape[1], y.shape[1]
         if ncx > 1 and ncy > 1 and ncx != ncy:
-            cbook.warn_deprecated(
-                "2.2", message="cycling among columns of inputs with "
-                "non-matching shapes is deprecated.")
+            raise ValueError(f"x has {ncx} columns but y has {ncy} columns")
         return [func(x[:, j % ncx], y[:, j % ncy], kw, kwargs)
                 for j in range(max(ncx, ncy))]
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -5479,12 +5479,13 @@ def test_square_plot():
         ax.get_position(original=False).extents, (0.2125, 0.1, 0.8125, 0.9))
 
 
-def test_no_None():
-    fig, ax = plt.subplots()
+def test_bad_plot_args():
     with pytest.raises(ValueError):
         plt.plot(None)
     with pytest.raises(ValueError):
         plt.plot(None, None)
+    with pytest.raises(ValueError):
+        plt.plot(np.zeros((2, 2)), np.zeros((2, 3)))
 
 
 @pytest.mark.parametrize(
@@ -6227,11 +6228,6 @@ def test_empty_errorbar_legend():
     ax.legend()
 
 
-def test_plot_columns_cycle_deprecation():
-    with pytest.warns(MatplotlibDeprecationWarning):
-        plt.plot(np.zeros((2, 2)), np.zeros((2, 3)))
-
-
 @check_figures_equal(extensions=["png"])
 def test_plot_decimal(fig_test, fig_ref):
     x0 = np.arange(-10, 10, 0.3)
