Most asserts changed to ValueErrors. Two changed to warning

montefra · montefra · commit aba9d99b9ff7 · 2015-03-04T23:48:30.000+01:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -969,7 +969,11 @@ def set_clip_path(self, path):
         Set the clip path and transformation.  Path should be a
         :class:`~matplotlib.transforms.TransformedPath` instance.
         """
-        assert path is None or isinstance(path, transforms.TransformedPath)
+        if path is not None and not isinstance(path,
+                transforms.TransformedPath):
+            msg = "Path should be a matplotlib.transforms.TransformedPath \
+            instance."
+            raise ValueError(msg)
         self._clippath = path
 
     def set_dashes(self, dash_offset, dash_list):
diff --git a/lib/matplotlib/blocking_input.py b/lib/matplotlib/blocking_input.py
@@ -30,6 +30,8 @@
 from matplotlib.cbook import is_sequence_of_strings
 import matplotlib.lines as mlines
 
+import warnings
+
 
 class BlockingInput(object):
     """
@@ -38,8 +40,8 @@ class BlockingInput(object):
     """
     def __init__(self, fig, eventslist=()):
         self.fig = fig
-        assert is_sequence_of_strings(
-            eventslist), "Requires a sequence of event name strings"
+        if not is_sequence_of_strings(eventslist):
+            raise ValueError("Requires a sequence of event name strings")
         self.eventslist = eventslist
 
     def on_event(self, event):
@@ -95,7 +97,8 @@ def __call__(self, n=1, timeout=30):
         Blocking call to retrieve n events
         """
 
-        assert isinstance(n, int), "Requires an integer argument"
+        if not isinstance(n, int):
+            raise ValueError("Requires an integer argument")
         self.n = n
 
         self.events = []
@@ -146,9 +149,9 @@ def post_event(self):
         """
         This will be called to process events
         """
-        assert len(self.events) > 0, "No events yet"
-
-        if self.events[-1].name == 'key_press_event':
+        if len(self.events) <= 0:
+            warnings.warn("No events yet")
+        elif self.events[-1].name == 'key_press_event':
             self.key_event()
         else:
             self.mouse_event()
@@ -359,9 +362,10 @@ def post_event(self):
         """
         Determines if it is a key event
         """
-        assert len(self.events) > 0, "No events yet"
-
-        self.keyormouse = self.events[-1].name == 'key_press_event'
+        if len(self.events) <= 0:
+            warnings.warn("No events yet")
+        else:
+            self.keyormouse = self.events[-1].name == 'key_press_event'
 
     def __call__(self, timeout=30):
         """
