Use explicit kwonly args for log axis methods

Zac-HD · Zac-HD · commit 3782de2468f6 · 2018-04-28T01:56:46.000+10:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1433,7 +1433,8 @@ 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, basey=10, subsx=None, subsy=None,
+               nonposx='mask', nonposy='mask', **kwargs):
         """
         Make a plot with log scaling on both the x and y axis.
 
@@ -1475,20 +1476,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 +1522,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='mask', **kwargs):
         """
         Make a plot with log scaling on the y axis.
 
@@ -1577,12 +1567,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):
