- util.flatten_iterator() func doesn't interpret strings with

__iter__() methods as iterators, such as in pypy [ticket:1077].

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 237772a40..01d2c738d 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -211,10 +211,10 @@ else:
 def flatten_iterator(x):
     """Given an iterator of which further sub-elements may also be
     iterators, flatten the sub-elements into a single iterator.
-    """
 
+    """
     for elem in x:
-        if hasattr(elem, '__iter__'):
+        if not isinstance(elem, basestring) and hasattr(elem, '__iter__'):
             for y in flatten_iterator(elem):
                 yield y
         else: