Merge pull request #9293 from anntzer/cleanup

dopplershift · web-flow · commit 11dcf76deeb7 · 2017-10-19T11:32:38.000-06:00
minor (unrelated) cleanups
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -90,20 +90,17 @@ def __delitem__(self, key):
 
 
 def get_named_colors_mapping():
-    """Return the global mapping of names to named colors.
-    """
+    """Return the global mapping of names to named colors."""
     return _colors_full_map
 
 
 def _is_nth_color(c):
-    """Return whether `c` can be interpreted as an item in the color cycle.
-    """
+    """Return whether *c* can be interpreted as an item in the color cycle."""
     return isinstance(c, six.string_types) and re.match(r"\AC[0-9]\Z", c)
 
 
 def is_color_like(c):
-    """Return whether `c` can be interpreted as an RGB(A) color.
-    """
+    """Return whether *c* can be interpreted as an RGB(A) color."""
     # Special-case nth color syntax because it cannot be parsed during
     # setup.
     if _is_nth_color(c):
@@ -117,10 +114,10 @@ def is_color_like(c):
 
 
 def to_rgba(c, alpha=None):
-    """Convert `c` to an RGBA color.
+    """Convert *c* to an RGBA color.
 
-    If `alpha` is not `None`, it forces the alpha value, except if `c` is
-    "none" (case-insensitive), which always maps to `(0, 0, 0, 0)`.
+    If *alpha* is not *None*, it forces the alpha value, except if *c* is
+    ``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
     """
     # Special-case nth color syntax because it should not be cached.
     if _is_nth_color(c):
@@ -140,10 +137,10 @@ def to_rgba(c, alpha=None):
 
 
 def _to_rgba_no_colorcycle(c, alpha=None):
-    """Convert `c` to an RGBA color, with no support for color-cycle syntax.
+    """Convert *c* to an RGBA color, with no support for color-cycle syntax.
 
-    If `alpha` is not `None`, it forces the alpha value, except if `c` is
-    "none" (case-insensitive), which always maps to `(0, 0, 0, 0)`.
+    If *alpha* is not ``None``, it forces the alpha value, except if *c* is
+    ``"none"`` (case-insensitive), which always maps to ``(0, 0, 0, 0)``.
     """
     orig_c = c
     if isinstance(c, six.string_types):
@@ -197,10 +194,10 @@ def _to_rgba_no_colorcycle(c, alpha=None):
 
 
 def to_rgba_array(c, alpha=None):
-    """Convert `c` to a (n, 4) array of RGBA colors.
+    """Convert *c* to a (n, 4) array of RGBA colors.
 
-    If `alpha` is not `None`, it forces the alpha value.  If `c` is "none"
-    (case-insensitive) or an empty list, an empty array is returned.
+    If *alpha* is not ``None``, it forces the alpha value.  If *c* is
+    ``"none"`` (case-insensitive) or an empty list, an empty array is returned.
     """
     # Special-case inputs that are already arrays, for performance.  (If the
     # array has the wrong kind or shape, raise the error during one-at-a-time
@@ -235,16 +232,15 @@ def to_rgba_array(c, alpha=None):
 
 
 def to_rgb(c):
-    """Convert `c` to an RGB color, silently dropping the alpha channel.
-    """
+    """Convert *c* to an RGB color, silently dropping the alpha channel."""
     return to_rgba(c)[:3]
 
 
 def to_hex(c, keep_alpha=False):
-    """Convert `c` to a hex color.
+    """Convert *c* to a hex color.
 
-    Uses the #rrggbb format if `keep_alpha` is False (the default), `#rrggbbaa`
-    otherwise.
+    Uses the ``#rrggbb`` format if *keep_alpha* is False (the default),
+    ``#rrggbbaa`` otherwise.
     """
     c = to_rgba(c)
     if not keep_alpha:
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1783,33 +1783,24 @@ def test_stackplot_baseline():
     np.random.seed(0)
 
     def layers(n, m):
-        def bump(a):
-            x = 1 / (.1 + np.random.random())
-            y = 2 * np.random.random() - .5
-            z = 10 / (.1 + np.random.random())
-            a += x * np.exp(-((np.arange(m) / m - y) * z) ** 2)
         a = np.zeros((m, n))
         for i in range(n):
             for j in range(5):
-                bump(a[:, i])
+                x = 1 / (.1 + np.random.random())
+                y = 2 * np.random.random() - .5
+                z = 10 / (.1 + np.random.random())
+                a[:, i] += x * np.exp(-((np.arange(m) / m - y) * z) ** 2)
         return a
 
     d = layers(3, 100)
     d[50, :] = 0  # test for fixed weighted wiggle (issue #6313)
 
-    fig = plt.figure()
-
-    plt.subplot(2, 2, 1)
-    plt.stackplot(list(xrange(100)), d.T, baseline='zero')
-
-    plt.subplot(2, 2, 2)
-    plt.stackplot(list(xrange(100)), d.T, baseline='sym')
-
-    plt.subplot(2, 2, 3)
-    plt.stackplot(list(xrange(100)), d.T, baseline='wiggle')
+    fig, axs = plt.subplots(2, 2)
 
-    plt.subplot(2, 2, 4)
-    plt.stackplot(list(xrange(100)), d.T, baseline='weighted_wiggle')
+    axs[0, 0].stackplot(range(100), d.T, baseline='zero')
+    axs[0, 1].stackplot(range(100), d.T, baseline='sym')
+    axs[1, 0].stackplot(range(100), d.T, baseline='wiggle')
+    axs[1, 1].stackplot(range(100), d.T, baseline='weighted_wiggle')
 
 
 @image_comparison(baseline_images=['bxp_baseline'],
diff --git a/setup.py b/setup.py
@@ -206,14 +206,12 @@ def run(self):
         # Abort if any of the required packages can not be built.
         if required_failed:
             print_line()
-            message = ("The following required packages can not "
-                       "be built: %s" %
-                       ", ".join(x.name for x in required_failed))
+            print_message("The following required packages can not be built: "
+                          "%s" % ", ".join(x.name for x in required_failed))
             for pkg in required_failed:
-                pkg_help = pkg.install_help_msg()
-                if pkg_help:
-                    message += "\n* " + pkg_help
-            print_message(message)
+                msg = pkg.install_get_help()
+                if msg:
+                    print_message(msg)
             sys.exit(1)
 
         # Now collect all of the information we need to build all of the
