Merge pull request #15711 from anntzer/3dscaledoc

timhoffm · web-flow · commit e11f3ef4b15b · 2019-11-18T20:54:47.000+01:00
Don't explicitly list scalez kwarg in Axes3D constructor and docs.
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -48,10 +48,9 @@ class Axes3D(Axes):
     name = '3d'
     _shared_z_axes = cbook.Grouper()
 
-    @docstring.dedent_interpd
     def __init__(
             self, fig, rect=None, *args,
-            azim=-60, elev=30, zscale=None, sharez=None, proj_type='persp',
+            azim=-60, elev=30, sharez=None, proj_type='persp',
             **kwargs):
         """
         Parameters
@@ -64,13 +63,14 @@ def __init__(
             Azimuthal viewing angle, defaults to -60.
         elev : float, optional
             Elevation viewing angle, defaults to 30.
-        zscale : %(scale_type)s, optional
-            The z scale.  Note that currently, only a linear scale is
-            supported.
         sharez : Axes3D, optional
             Other axes to share z-limits with.
         proj_type : {'persp', 'ortho'}
             The projection type, default 'persp'.
+        **kwargs
+            Other optional keyword arguments:
+
+            %(Axes3D)s
 
         Notes
         -----
@@ -110,9 +110,6 @@ def __init__(
         # func used to format z -- fall back on major formatters
         self.fmt_zdata = None
 
-        if zscale is not None:
-            self.set_zscale(zscale)
-
         if self.zaxis is not None:
             self._zcid = self.zaxis.callbacks.connect(
                 'units finalize', lambda: self._on_units_changed(scalez=True))
@@ -2876,6 +2873,10 @@ def permutation_matrices(n):
         return polygons
 
 
+docstring.interpd.update(Axes3D=artist.kwdoc(Axes3D))
+docstring.dedent_interpd(Axes3D.__init__)
+
+
 def get_test_data(delta=0.05):
     '''
     Return a tuple X, Y, Z with a test data set.
