Cleanup some bare excepts and related code.

Author: anntzer

lib/matplotlib/_backports/__init__.py

@@ -0,0 +1,3 @@
+"""
+Backported features from dependencies.
+"""

lib/matplotlib/_backports/numpy.py

@@ -0,0 +1,80 @@
+from __future__ import absolute_import
+
+import numpy as np
+
+
+# Copy-pasted from numpy.lib.stride_tricks 1.11.2.
+def _maybe_view_as_subclass(original_array, new_array):
+    if type(original_array) is not type(new_array):
+        # if input was an ndarray subclass and subclasses were OK,
+        # then view the result as that subclass.
+        new_array = new_array.view(type=type(original_array))
+        # Since we have done something akin to a view from original_array, we
+        # should let the subclass finalize (if it has it implemented, i.e., is
+        # not None).
+        if new_array.__array_finalize__:
+            new_array.__array_finalize__(original_array)
+    return new_array
+
+
+# Copy-pasted from numpy.lib.stride_tricks 1.11.2.
+def _broadcast_to(array, shape, subok, readonly):
+    shape = tuple(shape) if np.iterable(shape) else (shape,)
+    array = np.array(array, copy=False, subok=subok)
+    if not shape and array.shape:
+        raise ValueError('cannot broadcast a non-scalar to a scalar array')
+    if any(size < 0 for size in shape):
+        raise ValueError('all elements of broadcast shape must be non-'
+                         'negative')
+    needs_writeable = not readonly and array.flags.writeable
+    extras = ['reduce_ok'] if needs_writeable else []
+    op_flag = 'readwrite' if needs_writeable else 'readonly'
+    broadcast = np.nditer(
+        (array,), flags=['multi_index', 'refs_ok', 'zerosize_ok'] + extras,
+        op_flags=[op_flag], itershape=shape, order='C').itviews[0]
+    result = _maybe_view_as_subclass(array, broadcast)
+    if needs_writeable and not result.flags.writeable:
+        result.flags.writeable = True
+    return result
+
+
+# Copy-pasted from numpy.lib.stride_tricks 1.11.2.
+def broadcast_to(array, shape, subok=False):
+    """Broadcast an array to a new shape.
+
+    Parameters
+    ----------
+    array : array_like
+        The array to broadcast.
+    shape : tuple
+        The shape of the desired array.
+    subok : bool, optional
+        If True, then sub-classes will be passed-through, otherwise
+        the returned array will be forced to be a base-class array (default).
+
+    Returns
+    -------
+    broadcast : array
+        A readonly view on the original array with the given shape. It is
+        typically not contiguous. Furthermore, more than one element of a
+        broadcasted array may refer to a single memory location.
+
+    Raises
+    ------
+    ValueError
+        If the array is not compatible with the new shape according to NumPy's
+        broadcasting rules.
+
+    Notes
+    -----
+    .. versionadded:: 1.10.0
+
+    Examples
+    --------
+    >>> x = np.array([1, 2, 3])
+    >>> np.broadcast_to(x, (3, 3))
+    array([[1, 2, 3],
+           [1, 2, 3],
+           [1, 2, 3]])
+    """
+    return _broadcast_to(array, shape, subok=subok, readonly=True)

lib/matplotlib/afm.py

@@ -496,10 +496,7 @@ def get_kern_dist_from_name(self, name1, name2):
         Return the kerning pair distance (possibly 0) for chars
         *name1* and *name2*
         """
-        try:
-            return self._kern[(name1, name2)]
-        except:
-            return 0
+        return self._kern.get((name1, name2), 0)
 
     def get_fontname(self):
         "Return the font name, e.g., 'Times-Roman'"

lib/matplotlib/artist.py

@@ -1435,8 +1435,7 @@ def matchfunc(x):
         elif six.callable(match):
             matchfunc = func
         else:
-            raise ValueError('match must be None, an '
-                             'matplotlib.artist.Artist '
+            raise ValueError('match must be None, a matplotlib.artist.Artist '
                              'subclass, or a callable')
 
         artists = []

lib/matplotlib/backends/backend_gtk.py

@@ -561,7 +561,7 @@ def __init__(self, canvas, num):
 
         self.window = gtk.Window()
         self.set_window_title("Figure %d" % num)
-        if (window_icon):
+        if window_icon:
             try:
                 self.window.set_icon_from_file(window_icon)
             except:
@@ -790,13 +790,13 @@ def configure_subplots(self, button):
         toolfig.subplots_adjust(top=0.9)
         tool =  SubplotTool(self.canvas.figure, toolfig)
 
-        w = int (toolfig.bbox.width)
-        h = int (toolfig.bbox.height)
-
+        w = int(toolfig.bbox.width)
+        h = int(toolfig.bbox.height)
 
         window = gtk.Window()
-        if (window_icon):
-            try: window.set_icon_from_file(window_icon)
+        if window_icon:
+            try:
+                window.set_icon_from_file(window_icon)
             except:
                 # we presumably already logged a message on the
                 # failure of the main plot, don't keep reporting
@@ -1056,7 +1056,6 @@ def on_dialog_lineprops_cancelbutton_clicked(self, button):
 # Unfortunately, the SVG renderer (rsvg) leaks memory under earlier
 # versions of pygtk, so we have to use a PNG file instead.
 try:
-
     if gtk.pygtk_version < (2, 8, 0) or sys.platform == 'win32':
         icon_filename = 'matplotlib.png'
     else:

lib/matplotlib/backends/backend_gtk3.py

@@ -631,9 +631,8 @@ def configure_subplots(self, button):
         toolfig.subplots_adjust(top=0.9)
         tool =  SubplotTool(self.canvas.figure, toolfig)
 
-        w = int (toolfig.bbox.width)
-        h = int (toolfig.bbox.height)
-
+        w = int(toolfig.bbox.width)
+        h = int(toolfig.bbox.height)
 
         window = Gtk.Window()
         try:

lib/matplotlib/colors.py

@@ -358,7 +358,7 @@ def makeMappingArray(N, data, gamma=1.0):
 
     try:
         adata = np.array(data)
-    except:
+    except Exception:
         raise TypeError("data must be convertable to an array")
     shape = adata.shape
     if len(shape) != 2 or shape[1] != 3:

lib/matplotlib/contour.py

@@ -1179,8 +1179,8 @@ def _contour_level_args(self, z, args):
                         lev = np.asarray(level_arg).astype(np.float64)
                 except:
                     raise TypeError(
-                        "Last %s arg must give levels; see help(%s)" %
-                        (fn, fn))
+                        "Last {0} arg must give levels; see help({0})"
+                        .format(fn))
             self.levels = lev
         if self.filled and len(self.levels) < 2:
             raise ValueError("Filled contours require at least 2 levels.")

lib/matplotlib/font_manager.py

@@ -566,17 +566,16 @@ def createFontList(fontfiles, fontext='ttf'):
         if fontext == 'afm':
             try:
                 fh = open(fpath, 'rb')
-            except:
+            except EnvironmentError:
                 verbose.report("Could not open font file %s" % fpath)
                 continue
             try:
-                try:
-                    font = afm.AFM(fh)
-                finally:
-                    fh.close()
+                font = afm.AFM(fh)
             except RuntimeError:
                 verbose.report("Could not parse font file %s" % fpath)
                 continue
+            finally:
+                fh.close()
             try:
                 prop = afmFontProperty(fpath, font)
             except KeyError:

lib/matplotlib/image.py

@@ -1025,7 +1025,7 @@ def get_cursor_data(self, event):
         i = np.searchsorted(self._Ay, y) - 1
         try:
             return self._A[i, j]
-        except:
+        except IndexError:
             return None
 
 

lib/matplotlib/mlab.py

@@ -2778,11 +2778,7 @@ def process_skiprows(reader):
 
     def ismissing(name, val):
         "Should the value val in column name be masked?"
-
-        if val == missing or val == missingd.get(name) or val == '':
-            return True
-        else:
-            return False
+        return val == missing or val == missingd.get(name) or val == ''
 
     def with_default_value(func, default):
         def newfunc(name, val):
@@ -2825,18 +2821,14 @@ def mydate(x):
 
     def get_func(name, item, func):
         # promote functions in this order
-        funcmap = {mybool: myint, myint: myfloat, myfloat: mydate,
-                   mydate: mydateparser, mydateparser: mystr}
-        try:
-            func(name, item)
-        except:
-            if func == mystr:
-                raise ValueError('Could not find a working conversion '
-                                 'function')
-            else:
-                return get_func(name, item, funcmap[func])    # recurse
-        else:
+        funcs = [mybool, myint, myfloat, mydate, mydateparser, mystr]
+        for func in funcs[funcs.index(func):]:
+            try:
+                func(name, item)
+            except Exception:
+                continue
             return func
+        raise ValueError('Could not find a working conversion function')
 
     # map column names that clash with builtins -- TODO - extend this list
     itemd = {

lib/matplotlib/rcsetup.py

@@ -240,11 +240,11 @@ def validate_fonttype(s):
     try:
         fonttype = validate_int(s)
     except ValueError:
-        if s.lower() in six.iterkeys(fonttypes):
+        try:
             return fonttypes[s.lower()]
-        raise ValueError(
-            'Supported Postscript/PDF font types are %s' %
-            list(six.iterkeys(fonttypes)))
+        except KeyError:
+            raise ValueError(
+                'Supported Postscript/PDF font types are %s' % list(fonttypes))
     else:
         if fonttype not in six.itervalues(fonttypes):
             raise ValueError(
@@ -253,9 +253,8 @@ def validate_fonttype(s):
         return fonttype
 
 
-_validate_standard_backends = ValidateInStrings('backend',
-                                                all_backends,
-                                                ignorecase=True)
+_validate_standard_backends = ValidateInStrings(
+    'backend', all_backends, ignorecase=True)
 
 
 def validate_backend(s):
@@ -288,13 +287,11 @@ def validate_maskedarray(v):
                   ' please delete it from your matplotlibrc file')
 
 
+_seq_err_msg = ('You must supply exactly {n} values, you provided {num} '
+                'values: {s}')
 
-_seq_err_msg = ('You must supply exactly {n:d} values, you provided '
-                   '{num:d} values: {s}')
-
-_str_err_msg = ('You must supply exactly {n:d} comma-separated values, '
-                'you provided '
-                '{num:d} comma-separated values: {s}')
+_str_err_msg = ('You must supply exactly {n} comma-separated values, you '
+                'provided {num} comma-separated values: {s}')
 
 
 class validate_nseq_float(object):
@@ -466,20 +463,19 @@ def validate_font_properties(s):
     ['silent', 'helpful', 'debug', 'debug-annoying'])
 
 def validate_whiskers(s):
-    if s=='range':
+    if s == 'range':
         return 'range'
     else:
         try:
             v = validate_nseq_float(2)(s)
             return v
-        except:
+        except (TypeError, ValueError):
             try:
                 v = float(s)
                 return v
-            except:
-                err_str = ("Not a valid whisker value ['range',"
-                            "float, (float, float)]")
-                raise ValueError(err_str)
+            except ValueError:
+                raise ValueError("Not a valid whisker value ['range', float, "
+                                 "(float, float)]")
 
 
 def deprecate_savefig_extension(value):
@@ -653,7 +649,7 @@ def __init__(self, vmin, vmax, closedmin=True, closedmax=True):
     def __call__(self, s):
         try:
             s = float(s)
-        except:
+        except ValueError:
             raise RuntimeError('Value must be a float; found "%s"' % s)
 
         if self.cmin and s < self.vmin:

lib/matplotlib/testing/__init__.py

@@ -111,10 +111,7 @@ def assert_produces_warning(expected_warning=Warning, filter_level="always",
             if not _is_list_like(clear):
                 clear = [clear]
             for m in clear:
-                try:
-                    m.__warningregistry__.clear()
-                except:
-                    pass
+                getattr(m, "__warningregistry__", {}).clear()
 
         saw_warning = False
         warnings.simplefilter(filter_level)