Apply fix for invalid limits in log scale to y axis

astrofrog · astrofrog · commit bbe2147854ec · 2019-06-26T18:29:09.000+02:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3632,7 +3632,10 @@ def set_ylim(self, bottom=None, top=None, emit=True, auto=False,
             if top is None:
                 top = old_top
 
-        if self.get_yscale() == 'log':
+        if self.get_xscale() == 'log' and (bottom <= 0 or top <= 0):
+            # Axes init calls set_xlim(0, 1) before get_xlim() can be called,
+            # so only grab the limits if we really need them.
+            old_bottom, old_top = self.get_ylim()
             if bottom <= 0:
                 cbook._warn_external(
                     'Attempted to set non-positive bottom ylim on a '
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2147,6 +2147,9 @@ def test_log_scales_invalid():
     ax.set_xscale('log')
     with pytest.warns(UserWarning, match='Attempted to set non-positive'):
         ax.set_xlim(-1, 10)
+    ax.set_yscale('log')
+    with pytest.warns(UserWarning, match='Attempted to set non-positive'):
+        ax.set_ylim(-1, 10)
 
 
 @image_comparison(['stackplot_test_image', 'stackplot_test_image'])
