Remove expired renderer arg deprecations

dstansby · dstansby · commit bbe76a1a2386 · 2022-01-04T10:20:23.000Z
Finish up renderer arg deprecation
diff --git a/doc/api/next_api_changes/removals/00001-DS.rst b/doc/api/next_api_changes/removals/00001-DS.rst
@@ -0,0 +1,10 @@
+Removal of ``renderer`` arguments in mplot3d
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The deprecated ``renderer`` arguments have been removed from:
+
+- `.Line3DCollection.do_3d_projection`
+- `.Patch3D.do_3d_projection`
+- `.PathPatch3D.do_3d_projection`
+- `.Path3DCollection.do_3d_projection`
+- `.Patch3DCollection.do_3d_projection`
+- `.Poly3DCollection.do_3d_projection`
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -297,8 +297,7 @@ def set_segments(self, segments):
         self._segments3d = segments
         super().set_segments([])
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         """
         Project the points according to renderer matrix.
         """
@@ -346,8 +345,7 @@ def set_3d_properties(self, verts, zs=0, zdir='z'):
     def get_path(self):
         return self._path2d
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         s = self._segment3d
         xs, ys, zs = zip(*s)
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
@@ -370,8 +368,7 @@ def set_3d_properties(self, path, zs=0, zdir='z'):
         Patch3D.set_3d_properties(self, path.vertices, zs=zs, zdir=zdir)
         self._code3d = path.codes
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         s = self._segment3d
         xs, ys, zs = zip(*s)
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
@@ -466,8 +463,7 @@ def set_3d_properties(self, zs, zdir):
         self._vzs = None
         self.stale = True
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
@@ -594,8 +590,7 @@ def set_depthshade(self, depthshade):
         self._depthshade = depthshade
         self.stale = True
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
@@ -786,8 +781,7 @@ def set_sort_zpos(self, val):
         self._sort_zpos = val
         self.stale = True
 
-    @_api.delete_parameter('3.4', 'renderer')
-    def do_3d_projection(self, renderer=None):
+    def do_3d_projection(self):
         """
         Perform the 3D projection for this object.
         """
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -424,29 +424,9 @@ def draw(self, renderer):
         with cbook._setattr_cm(type(renderer), **props3d):
             def do_3d_projection(artist):
                 """
-                Call `do_3d_projection` on an *artist*, and warn if passing
-                *renderer*.
-
-                Attempt to bind the empty signature first, so external Artists
-                can avoid the deprecation warning if they support the new
-                calling convention.
+                Call `do_3d_projection` on an *artist*.
                 """
-                try:
-                    signature = inspect.signature(artist.do_3d_projection)
-                    signature.bind()
-                # ValueError if `inspect.signature` cannot provide a signature
-                # and TypeError if the binding fails or the object does not
-                # appear to be callable - the next call will then re-raise.
-                except (ValueError, TypeError):
-                    _api.warn_deprecated(
-                        "3.4",
-                        message="The 'renderer' parameter of "
-                        "do_3d_projection() was deprecated in Matplotlib "
-                        "%(since)s and will be removed %(removal)s.")
-                    return artist.do_3d_projection(renderer)
-                else:
-                    # Call this directly once the deprecation period expires.
-                    return artist.do_3d_projection()
+                return artist.do_3d_projection()
 
             collections_and_patches = (
                 artist for artist in self._children
diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
@@ -1713,63 +1713,3 @@ def test_view_init_vertical_axis(
         tickdir_expected = tickdirs_expected[i]
         tickdir_actual = axis._get_tickdir()
         np.testing.assert_array_equal(tickdir_expected, tickdir_actual)
-
-
-def test_do_3d_projection_renderer_deprecation_warn_on_argument():
-    """
-    Test that an external artist with an old-style calling convention raises
-    a suitable deprecation warning.
-    """
-    class DummyPatch(art3d.Patch3D):
-        def do_3d_projection(self, renderer):
-            return 0
-
-        def draw(self, renderer):
-            pass
-
-    fig = plt.figure()
-    ax = fig.add_subplot(111, projection='3d')
-    artist = DummyPatch()
-    ax.add_artist(artist)
-
-    match = r"The 'renderer' parameter of do_3d_projection\(\) was deprecated"
-    with pytest.warns(MatplotlibDeprecationWarning, match=match):
-        fig.canvas.draw()
-
-
-def test_do_3d_projection_renderer_deprecation_nowarn_on_optional_argument():
-    """
-    Test that an external artist with a calling convention compatible with
-    both v3.3 and v3.4 does not raise a deprecation warning.
-    """
-    class DummyPatch(art3d.Patch3D):
-        def do_3d_projection(self, renderer=None):
-            return 0
-
-        def draw(self, renderer):
-            pass
-
-    fig = plt.figure()
-    ax = fig.add_subplot(111, projection='3d')
-    artist = DummyPatch()
-    ax.add_artist(artist)
-    fig.canvas.draw()
-
-
-def test_do_3d_projection_renderer_deprecation_nowarn_on_no_argument():
-    """
-    Test that an external artist with a calling convention compatible with
-    only v3.4 does not raise a deprecation warning.
-    """
-    class DummyPatch(art3d.Patch3D):
-        def do_3d_projection(self):
-            return 0
-
-        def draw(self, renderer):
-            pass
-
-    fig = plt.figure()
-    ax = fig.add_subplot(111, projection='3d')
-    artist = DummyPatch()
-    ax.add_artist(artist)
-    fig.canvas.draw()
