handle is None keys by returning

jdh2358 · jdh2358 · commit 6dbedd767acd · 2010-06-02T13:36:46.000Z
svn path=/trunk/matplotlib/; revision=8367
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2062,6 +2062,9 @@ def key_press(self, event):
         #    self.destroy() # how cruel to have to destroy oneself!
         #    return
 
+        if event.key is None:
+            return
+
         # Load key-mappings from your matplotlibrc file.
         fullscreen_keys = rcParams['keymap.fullscreen']
         home_keys = rcParams['keymap.home']
@@ -2128,8 +2131,7 @@ def key_press(self, event):
                 ax.set_xscale('log')
                 ax.figure.canvas.draw()
 
-        elif event.key is not None and \
-                 (event.key.isdigit() and event.key!='0') or event.key in all:
+        elif (event.key.isdigit() and event.key!='0') or event.key in all:
             # keys in list 'all' enables all axes (default key 'a'),
             # otherwise if key is a number only enable this particular axes
             # if it was the axes, where the event was raised
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -663,6 +663,13 @@ def set_data(self, x, y, A):
         self._Ay = y
         self._imcache = None
 
+        # I am adding this in accor with _AxesImageBase.set_data --
+        # examples/pylab_examples/image_nonuniform.py was breaking on
+        # the call to _get_unsampled_image when the oldxslice attr was
+        # accessed - JDH 3/3/2010
+        self._oldxslice = None
+        self._oldyslice = None
+
     def set_array(self, *args):
         raise NotImplementedError('Method not supported')
 
