Small cleanups.

anntzer · anntzer · commit 0f61459b2f41 · 2018-05-08T23:27:37.000-07:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -855,8 +855,7 @@ def _get_extension_lengths(self, frac, automin, automax, default=0.05):
         if isinstance(frac, str):
             if frac.lower() == 'auto':
                 # Use the provided values when 'auto' is required.
-                extendlength[0] = automin
-                extendlength[1] = automax
+                extendlength[:] = [automin, automax]
             else:
                 # Any other string is invalid.
                 raise ValueError('invalid value for extendfrac')
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -354,10 +354,8 @@ def __init__(self, xdata, ydata,
         if isinstance(linestyle, six.string_types):
             ds, ls = self._split_drawstyle_linestyle(linestyle)
             if ds is not None and drawstyle is not None and ds != drawstyle:
-                raise ValueError("Inconsistent drawstyle ({0!r}) and "
-                                 "linestyle ({1!r})".format(drawstyle,
-                                                            linestyle)
-                                 )
+                raise ValueError("Inconsistent drawstyle ({!r}) and linestyle "
+                                 "({!r})".format(drawstyle, linestyle))
             linestyle = ls
 
             if ds is not None:
@@ -1088,10 +1086,9 @@ def set_linestyle(self, ls):
                 try:
                     ls = ls_mapper_r[ls]
                 except KeyError:
-                    raise ValueError(("You passed in an invalid linestyle, "
-                                      "`{0}`.  See "
-                                      "docs of Line2D.set_linestyle for "
-                                      "valid values.").format(ls))
+                    raise ValueError("Invalid linestyle {!r}; see docs of "
+                                     "Line2D.set_linestyle for valid values"
+                                     .format(ls))
             self._linestyle = ls
         else:
             self._linestyle = '--'
diff --git a/lib/matplotlib/markers.py b/lib/matplotlib/markers.py
@@ -249,8 +249,8 @@ def set_marker(self, marker):
                 Path(marker)
                 self._marker_function = self._set_vertices
             except ValueError:
-                raise ValueError('Unrecognized marker style'
-                                 ' {0}'.format(marker))
+                raise ValueError('Unrecognized marker style {!r}'
+                                 .format(marker))
 
         self._marker = marker
         self._recache()
diff --git a/lib/matplotlib/table.py b/lib/matplotlib/table.py
@@ -241,13 +241,13 @@ def __init__(self, ax, loc=None, bbox=None, **kwargs):
 
         Artist.__init__(self)
 
-        if isinstance(loc, str) and loc not in self.codes:
-            warnings.warn('Unrecognized location %s. Falling back on '
-                          'bottom; valid locations are\n%s\t' %
-                          (loc, '\n\t'.join(self.codes)))
-            loc = 'bottom'
         if isinstance(loc, str):
-            loc = self.codes.get(loc, 1)
+            if loc not in self.codes:
+                warnings.warn('Unrecognized location %s. Falling back on '
+                              'bottom; valid locations are\n%s\t' %
+                              (loc, '\n\t'.join(self.codes)))
+                loc = 'bottom'
+            loc = self.codes[loc]
         self.set_figure(ax.figure)
         self._axes = ax
         self._loc = loc
