matplotlib · WeatherGod · Nov 20, 2014
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1442,6 +1442,7 @@ def tk_window_focus():
     'matplotlib.tests.test_triangulation',
     'mpl_toolkits.tests.test_mplot3d',
     'matplotlib.tests.test_widgets',
+    'matplotlib.tests.test_cycles',
     ]
 
 

diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1271,7 +1271,9 @@ def plot(self, *args, **kwargs):
 
         By default, each line is assigned a different color specified by a
         'color cycle'.  To change this behavior, you can edit the
-        axes.color_cycle rcParam.
+        axes.color_cycle rcParam. Similarly, the default linestyle is
+        also specified by a 'linestyle cycle'. Edit the axes.linestyle_cycle
+        rcParam to specify a non-trivial cycle.
 
         The following format string characters are accepted to control
         the line style or marker:

diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -140,6 +140,7 @@ def __init__(self, axes, command='plot'):
         self.axes = axes
         self.command = command
         self.set_color_cycle()
+        self.set_linestyle_cycle()
 
     def __getstate__(self):
         # note: it is not possible to pickle a itertools.cycle instance
@@ -148,12 +149,18 @@ def __getstate__(self):
     def __setstate__(self, state):
         self.__dict__ = state.copy()
         self.set_color_cycle()
+        self.set_linestyle_cycle()
 
     def set_color_cycle(self, clist=None):
         if clist is None:
             clist = rcParams['axes.color_cycle']
         self.color_cycle = itertools.cycle(clist)
 
+    def set_linestyle_cycle(self, clist=None):
+        if clist is None:
+            clist = rcParams['axes.linestyle_cycle']
+        self.linestyle_cycle = itertools.cycle(clist)
+
     def __call__(self, *args, **kwargs):
 
         if self.axes.xaxis is not None and self.axes.yaxis is not None:
@@ -236,6 +243,8 @@ def _makeline(self, x, y, kw, kwargs):
             kw['color'] = six.next(self.color_cycle)
             # (can't use setdefault because it always evaluates
             # its second argument)
+        if 'linestyle' not in kw and 'linestyle' not in kwargs:
+            kw['linestyle'] = six.next(self.linestyle_cycle)
         seg = mlines.Line2D(x, y,
                             axes=self.axes,
                             **kw
@@ -955,6 +964,14 @@ def set_color_cycle(self, clist):
         self._get_lines.set_color_cycle(clist)
         self._get_patches_for_fill.set_color_cycle(clist)
 
+    def set_linestyle_cycle(self, clist):
+        """
+        Set the linestyle cycle for any future plot commands on this Axes.
+
+        *clist* is a list of mpl linestyle specifiers.
+        """
+        self._get_lines.set_linestyle_cycle(clist)
+
     def ishold(self):
         """return the HOLD status of the axes"""
         return self._hold

diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -612,6 +612,9 @@ def __call__(self, s):
     'axes.color_cycle': [['b', 'g', 'r', 'c', 'm', 'y', 'k'],
                          validate_colorlist],  # cycle of plot
                                                # line colors
+    'axes.linestyle_cycle': [['-'],
+                         validate_stringlist],  # cycle of plot
+                                                # line styles
     'axes.xmargin': [0, ValidateInterval(0, 1,
                                          closedmin=True,
                                          closedmax=True)],  # margin added to xaxis

diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.pdf b/lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.pdf
diff --git a/lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.png b/lib/matplotlib/tests/baseline_images/test_cycles/color_cycle_basic.png