SF.net SVN: matplotlib:[6757] trunk/matplotlib/lib/matplotlib/contour.py

[<ef...@us...>]

Revision: 6757
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6757&view=rev
Author:   efiring
Date:     2009-01-07 00:07:41 +0000 (Wed, 07 Jan 2009)

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

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/contour.py

Modified: trunk/matplotlib/lib/matplotlib/contour.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/contour.py	2009-01-06 23:38:46 UTC (rev 6756)
+++ trunk/matplotlib/lib/matplotlib/contour.py	2009-01-07 00:07:41 UTC (rev 6757)
@@ -873,8 +873,6 @@
                     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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.