Fix failing tests

blink1073 · blink1073 · commit cf58c0a387b7 · 2014-11-12T05:43:22.000-06:00
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -75,6 +75,7 @@ def onselect(epress, erelease):
         assert erelease.xdata == 150
         assert erelease.ydata == 150
 
+
     tool = widgets.RectangleSelector(ax, onselect, **kwargs)
     event = get_event(ax, xdata=100, ydata=100, button=1)
     tool.press(event)
@@ -144,7 +145,6 @@ def check_lasso_selector(**kwargs):
 
     def onselect(verts):
         ax._got_onselect = True
-        print(verts)
         assert verts == [(100, 100), (125, 125), (150, 150)]
 
     tool = widgets.LassoSelector(ax, onselect, **kwargs)
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -1108,10 +1108,10 @@ def __init__(self, ax, onselect, useblit=False, button=None):
         self.artists = []
         self.useblit = useblit and self.canvas.supports_blit
 
-        if button is None or isinstance(button, list):
-            self.validButtons = button
-        elif isinstance(button, int):
+        if isinstance(button, int):
             self.validButtons = [button]
+        else:
+            self.validButtons = button
 
         # will save the data (position at mouseclick)
         self.eventpress = None
@@ -1192,8 +1192,16 @@ def update(self):
             if self.background is not None:
                 self.canvas.restore_region(self.background)
             for artist in self.artists:
-                self.ax.draw_artist(artist)
-            self.canvas.blit(self.ax.bbox)
+                try:
+                    self.ax.draw_artist(artist)
+                except AssertionError:
+                    self.canvas.draw_idle()
+                    return False
+            try:
+                self.canvas.blit(self.ax.bbox)
+            except AttributeError:
+                self.canvas.draw_idle()
+                return False
         else:
             self.canvas.draw_idle()
         return False
@@ -1425,7 +1433,6 @@ def onmove(self, event):
             self.onmove_callback(vmin, vmax)
 
         self.update()
-        self.eventpress = None
         return False
 
 
