Fix bug introduced in 6755 and modified in 6756--problem using svnmerge?

efiring · efiring · commit e7b2af3b4574 · 2009-01-07T00:07:41.000Z
svn path=/trunk/matplotlib/; revision=6757
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -873,8 +873,6 @@ def _process_linestyles(self):
                     tlinestyles = tlinestyles * nreps
                 if len(tlinestyles) > Nlev:
                     tlinestyles = tlinestyles[:Nlev]
-            elif cbook.iterable(linestyles): # len(linestyles) >= Nlev
-                tlinestyles = list(linestyles)[:Nlev]
             else:
                 raise ValueError("Unrecognized type for linestyles kwarg")
         return tlinestyles
