Merge pull request #6983 from anntzer/dont-crash-on-interactive-invalid-log

tacaswell · tacaswell · commit ac01d8505574 · 2016-08-26T22:43:15.000-04:00
FIX: Catch invalid interactive switch to log scale.
Conflicts:
	lib/matplotlib/backend_bases.py
  	   did not backport draw -&gt; draw_idle change
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2543,7 +2543,11 @@ def key_press_handler(event, canvas, toolbar=None):
             ax.set_yscale('linear')
             ax.figure.canvas.draw()
         elif scale == 'linear':
-            ax.set_yscale('log')
+            try:
+                ax.set_yscale('log')
+            except ValueError as exc:
+                warnings.warn(str(exc))
+                ax.set_yscale('linear')
             ax.figure.canvas.draw()
     # toggle scaling of x-axes between 'log and 'linear' (default key 'k')
     elif event.key in toggle_xscale_keys:
@@ -2553,7 +2557,11 @@ def key_press_handler(event, canvas, toolbar=None):
             ax.set_xscale('linear')
             ax.figure.canvas.draw()
         elif scalex == 'linear':
-            ax.set_xscale('log')
+            try:
+                ax.set_xscale('log')
+            except ValueError:
+                warnings.warn(str(exc))
+                ax.set_xscale('linear')
             ax.figure.canvas.draw()
 
     elif (event.key.isdigit() and event.key != '0') or event.key in all:
