Merge pull request #10014 from jklymak/fix-nonposxy-log

anntzer · web-flow · commit d4c24f26f387 · 2017-12-15T11:03:26.000-08:00
FIX: pass nonposx/y args through loglog etc
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1500,12 +1500,10 @@ def loglog(self, *args, **kwargs):
         if not self._hold:
             self.cla()
 
-        dx = {'basex': kwargs.pop('basex', 10),
-              'subsx': kwargs.pop('subsx', None),
-              }
-        dy = {'basey': kwargs.pop('basey', 10),
-              'subsy': kwargs.pop('subsy', None),
-              }
+        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)
@@ -1560,9 +1558,8 @@ def semilogx(self, *args, **kwargs):
         """
         if not self._hold:
             self.cla()
-        d = {'basex': kwargs.pop('basex', 10),
-             'subsx': kwargs.pop('subsx', None),
-             }
+        d = {k: kwargs.pop(k) for k in ['basex', 'subsx', 'nonposx']
+                if k in kwargs}
 
         self.set_xscale('log', **d)
         b = self._hold
@@ -1615,9 +1612,8 @@ def semilogy(self, *args, **kwargs):
 
         if not self._hold:
             self.cla()
-        d = {'basey': kwargs.pop('basey', 10),
-             'subsy': kwargs.pop('subsy', None),
-             }
+        d = {k: kwargs.pop(k) for k in ['basey', 'subsy', 'nonposy']
+                if k in kwargs}
         self.set_yscale('log', **d)
         b = self._hold
         self._hold = True  # we've already processed the hold
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_loglog_nonpos.png b/lib/matplotlib/tests/baseline_images/test_axes/test_loglog_nonpos.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4964,6 +4964,24 @@ def test_loglog():
     ax.tick_params(length=15, width=2, which='minor')
 
 
+@image_comparison(baseline_images=["test_loglog_nonpos"],
+                  remove_text=True, extensions=['png'], style='mpl20')
+def test_loglog_nonpos():
+    fig, ax = plt.subplots(3, 3)
+    x = np.arange(1, 11)
+    y = x**3
+    y[7] = -3.
+    x[4] = -10
+    for nn, mcx in enumerate(['mask', 'clip', '']):
+        for mm, mcy in enumerate(['mask', 'clip', '']):
+            kws = {}
+            if mcx:
+                kws['nonposx'] = mcx
+            if mcy:
+                kws['nonposy'] = mcy
+            ax[mm, nn].loglog(x, y**3, lw=2, **kws)
+
+
 @pytest.mark.style('default')
 def test_axes_margins():
     fig, ax = plt.subplots()
