Fault tolerant handling of linestyles when too many

mmetz-bn · mmetz-bn · commit e18db0370431 · 2009-01-06T18:59:31.000Z
svn path=/trunk/matplotlib/; revision=6745
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2009-01-06 Be fault tolerant when len(linestyles)>NLev in contour. - MM
+
 2009-01-06 Added marginals kwarg to hexbin to plot marginal densities 
            JDH
 
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -860,8 +860,10 @@ def _process_linestyles(self):
         else:
             if cbook.is_string_like(linestyles):
                 tlinestyles = [linestyles] * Nlev
-            elif cbook.iterable(linestyles) and len(linestyles) <= Nlev:
+            elif cbook.iterable(linestyles) and len(linestyles) < Nlev:
                 tlinestyles = list(linestyles) * int(np.ceil(Nlev/len(linestyles)))
+            elif cbook.iterable(linestyles): # len(linestyles) >= Nlev
+                tlinestyles = list(linestyles)[:Nlev]
         return tlinestyles
 
     def get_alpha(self):

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2009-01-06 Be fault tolerant when len(linestyles)>NLev in contour. - MM`
	`2`	`+`
`1`	`3`	`2009-01-06 Added marginals kwarg to hexbin to plot marginal densities`
`2`	`4`	`JDH`
`3`	`5`