Merge branch 'iterable' of git://github.com/mdboom/matplotlib

efiring · efiring · commit 0a9e86a91d9c · 2011-03-23T08:56:31.000-10:00
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -374,8 +374,10 @@ def unique(x):
 
 def iterable(obj):
     'return true if *obj* is iterable'
-    try: len(obj)
-    except: return False
+    try:
+        iter(obj)
+    except TypeError:
+        return False
     return True
 
 
