Merge pull request #13225 from anntzer/docwarn

dstansby · web-flow · commit 8392fadd562b · 2019-01-20T12:01:48.000Z
Fix a warning in the doc build.
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -29,13 +29,14 @@ def __init__(self, axis, **kwargs):
         r"""
         Construct a new scale.
 
-        Note
-        ----
+        Notes
+        -----
         The following note is for scale implementors.
 
-        For back-compatibility reasons, scales take an `~.Axis` object as first
-        argument.  However, this argument should not be used: a single scale
-        object should be usable by multiple `~.Axis`\es at the same time.
+        For back-compatibility reasons, scales take an `~matplotlib.axis.Axis`
+        object as first argument.  However, this argument should not
+        be used: a single scale object should be usable by multiple
+        `~matplotlib.axis.Axis`\es at the same time.
         """
 
     def get_transform(self):
@@ -71,6 +72,14 @@ class LinearScale(ScaleBase):
 
     name = 'linear'
 
+    def __init__(self, axis, **kwargs):
+        # This method is present only to prevent inheritance of the base class'
+        # constructor docstring, which would otherwise end up interpolated into
+        # the docstring of Axis.set_scale.
+        """
+        """
+        super().__init__(axis, **kwargs)
+
     def set_default_locators_and_formatters(self, axis):
         """
         Set the locators and formatters to reasonable defaults for
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -840,6 +840,7 @@ def set_zscale(self, value, **kwargs):
         ACCEPTS: [%(scale)s]
 
         Different kwargs are accepted, depending on the scale:
+
         %(scale_docs)s
 
         .. note ::
