Use named kwargs for log method and fix docs

Zac-HD · Zac-HD · commit 21e9e65bfc48 · 2018-04-28T12:31:15.000+10:00
The default behaviour for the yaxis was actually 'clip', but documented
as 'mask' (xaxis was correctly documented as 'mask').
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1433,7 +1433,10 @@ def plot_date(self, x, y, fmt='o', tz=None, xdate=True, ydate=False,
 
     # @_preprocess_data() # let 'plot' do the unpacking..
     @docstring.dedent_interpd
-    def loglog(self, *args, **kwargs):
+    def loglog(self, *args,
+               basex=10, subsx=None, nonposx='mask',
+               basey=10, subsy=None, nonposy='clip',
+               **kwargs):
         """
         Make a plot with log scaling on both the x and y axis.
 
@@ -1461,9 +1464,10 @@ def loglog(self, *args, **kwargs):
             decades in the plot.
             See `.Axes.set_xscale` / `.Axes.set_yscale` for details.
 
-        nonposx, nonposy : {'mask', 'clip'}, optional, default 'mask'
+        nonposx, nonposy : {'mask', 'clip'}, optional
             Non-positive values in x or y can be masked as invalid, or clipped
             to a very small positive number.
+            Default 'mask' for xaxis and 'clip' for yaxis.
 
         Returns
         -------
@@ -1475,20 +1479,13 @@ def loglog(self, *args, **kwargs):
         **kwargs
             All parameters supported by `.plot`.
         """
-        dx = {k: kwargs.pop(k) for k in ['basex', 'subsx', 'nonposx']
-                if k in kwargs}
-        dy = {k: kwargs.pop(k) for k in ['basey', 'subsy', 'nonposy']
-                if k in kwargs}
-
-        self.set_xscale('log', **dx)
-        self.set_yscale('log', **dy)
-
-        l = self.plot(*args, **kwargs)
-        return l
+        self.set_xscale('log', basex=basex, subsx=subsx, nonposx=nonposx)
+        self.set_yscale('log', basey=basey, subsy=subsy, nonposy=nonposy)
+        return self.plot(*args, **kwargs)
 
     # @_preprocess_data() # let 'plot' do the unpacking..
     @docstring.dedent_interpd
-    def semilogx(self, *args, **kwargs):
+    def semilogx(self, *args, basex=10, subsx=None, nonposx='mask', **kwargs):
         """
         Make a plot with log scaling on the x axis.
 
@@ -1528,16 +1525,12 @@ def semilogx(self, *args, **kwargs):
         **kwargs
             All parameters supported by `.plot`.
         """
-        d = {k: kwargs.pop(k) for k in ['basex', 'subsx', 'nonposx']
-                if k in kwargs}
-
-        self.set_xscale('log', **d)
-        l = self.plot(*args, **kwargs)
-        return l
+        self.set_xscale('log', basex=basex, subsx=subsx, nonposx=nonposx)
+        return self.plot(*args, **kwargs)
 
     # @_preprocess_data() # let 'plot' do the unpacking..
     @docstring.dedent_interpd
-    def semilogy(self, *args, **kwargs):
+    def semilogy(self, *args, basey=10, subsy=None, nonposy='clip', **kwargs):
         """
         Make a plot with log scaling on the y axis.
 
@@ -1563,7 +1556,7 @@ def semilogy(self, *args, **kwargs):
             are automatically chosen depending on the number of decades in the
             plot. See `.Axes.set_yscale` for details.
 
-        nonposy : {'mask', 'clip'}, optional, default 'mask'
+        nonposy : {'mask', 'clip'}, optional, default 'clip'
             Non-positive values in y can be masked as invalid, or clipped to a
             very small positive number.
 
@@ -1577,12 +1570,8 @@ def semilogy(self, *args, **kwargs):
         **kwargs
             All parameters supported by `.plot`.
         """
-        d = {k: kwargs.pop(k) for k in ['basey', 'subsy', 'nonposy']
-             if k in kwargs}
-        self.set_yscale('log', **d)
-        l = self.plot(*args, **kwargs)
-
-        return l
+        self.set_yscale('log', basey=basey, subsy=subsy, nonposy=nonposy)
+        return self.plot(*args, **kwargs)
 
     @_preprocess_data(replace_names=["x"], label_namer="x")
     def acorr(self, x, **kwargs):
