- Squashed 2.4 generators.

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e5911457746725dce0319627a7d02b889ecd7093..4028eed6a42cc3c6a07f9092d673bb851e82e694 100644 (file)
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -594,7 +594,7 @@ class EagerLoader(AbstractRelationLoader):
     def create_row_processor(self, selectcontext, mapper, row):
 
         row_decorator = self._create_row_decorator(selectcontext, row, selectcontext.path)
-        pathstr = ','.join(str(x) for x in selectcontext.path)
+        pathstr = ','.join([str(x) for x in selectcontext.path])
         if row_decorator is not None:
             def execute(instance, row, isnew, **flags):
                 decorated_row = row_decorator(row)

diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index 69b5d8fedcbc3ed92e6051106750ffbc0fdc947b..cf0936e9228db56df1e264f59e2a01c134752dd3 100644 (file)
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -418,7 +418,9 @@ class ExecutionContextWrapper(object):
                          ) \
                          and \
                          ( (params is None) or (params == parameters)
-                           or params == [dict((k.strip('_'), v) for (k, v) in p.items())for p in parameters]
+                           or params == [dict([(k.strip('_'), v)
+                                               for (k, v) in p.items()])
+                                         for p in parameters]
                          )
             testdata.unittest.assert_(equivalent, 
                     "Testing for query '%s' params %s, received '%s' with params %s" % (query, repr(params), statement, repr(parameters)))