Support [N] syntax in rcParams file

mdboom · mdboom · commit ced56dd42bc5 · 2015-12-16T09:17:45.000-05:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -32,7 +32,8 @@
     - w: white
 
 To use the colors that are part of the active color cycle in the
-current style, use a string with the color number in square brackets.
+current style, use a string with a positive index in square brackets.
+If the index is larger than the color cycle, it is wrapped around.
 For example:
 
     - `[0]`: The first color in the cycle
@@ -220,6 +221,13 @@
 
 def is_color_like(c):
     'Return *True* if *c* can be converted to *RGB*'
+    # Special-case the N-th color cycle syntax, because it's parsing
+    # needs to be deferred.  We may be reading a value from rcParams
+    # here before the color_cycle rcParam has been parsed.
+    match = re.match('^\[[0-9]\]$', c)
+    if match is not None:
+        return True
+
     try:
         colorConverter.to_rgb(c)
         return True
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -827,7 +827,7 @@ def validate_hist_bins(s):
     # line props
     'lines.linewidth':       [1.0, validate_float],  # line width in points
     'lines.linestyle':       ['-', six.text_type],             # solid line
-    'lines.color':           ['b', validate_color],  # blue
+    'lines.color':           ['[0]', validate_color],  # blue
     'lines.marker':          ['None', six.text_type],     # black
     'lines.markeredgewidth': [1.0, validate_float],
     'lines.markersize':      [6, validate_float],    # markersize, in points
@@ -843,7 +843,7 @@ def validate_hist_bins(s):
     ## patch props
     'patch.linewidth':   [None, validate_float_or_None],  # line width in points
     'patch.edgecolor':   ['k', validate_color],  # black
-    'patch.facecolor':   ['b', validate_color],  # blue
+    'patch.facecolor':   ['[0]', validate_color],  # blue
     'patch.antialiased': [True, validate_bool],  # antialiased (no jaggies)
 
     ## Histogram properties
@@ -992,9 +992,6 @@ def validate_hist_bins(s):
     'axes.formatter.use_mathtext': [False, validate_bool],
     'axes.formatter.useoffset': [True, validate_bool],
     'axes.unicode_minus': [True, validate_bool],
-    'axes.color_cycle': [['b', 'g', 'r', 'c', 'm', 'y', 'k'],
-                         deprecate_axes_colorcycle],  # cycle of plot
-                                                      # line colors
     # This entry can be either a cycler object or a
     # string repr of a cycler-object, which gets eval()'ed
     # to create the object.
