Removed try-except that are not needed

paulkirow · paulkirow · commit ea6894fbb48f · 2016-04-01T22:14:24.000-04:00
diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py
@@ -276,15 +276,11 @@ def to_rgba(self, x, alpha=None, bytes=False, norm=True):
         if norm:
             x = self.norm(x)
 
-        try:
-            np_alpha = ma.asarray(alpha)
-            if np_alpha.ndim == 1 and np_alpha.shape == x.shape:
-                rgba = self.cmap(x, bytes=bytes)
-                rgba[0:, 3] = np_alpha
-                return rgba
-        except AttributeError:
-            # e.g., alpha is not an array;
-            pass
+        np_alpha = ma.asarray(alpha)
+        if np_alpha.ndim == 1 and np_alpha.shape == x.shape:
+            rgba = self.cmap(x, bytes=bytes)
+            rgba[0:, 3] = np_alpha
+            return rgba
 
         rgba = self.cmap(x, alpha=alpha, bytes=bytes)
         return rgba
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -678,14 +678,11 @@ def set_alpha(self, alpha):
         ACCEPTS: float or None
         """
         if alpha is not None:
-            try:
-                # Check if alpha is an array of matching size
-                np_alpha = ma.asarray(alpha)
-                if np_alpha.ndim == 1:
-                    artist.Artist.set_alpha(self, np_alpha)
-                    return
-            except AttributeError:
-                pass
+            # Check if alpha is an array of matching size
+            np_alpha = ma.asarray(alpha)
+            if np_alpha.ndim == 1:
+                artist.Artist.set_alpha(self, np_alpha)
+                return
             try:
                 float(alpha)
             except TypeError:
