summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-04-01 18:31:20 +0000
committerJason Kirtland <jek@discorporate.us>2008-04-01 18:31:20 +0000
commitb93eb67f4be65568452cfcd3ef507337d5ccc8d4 (patch)
treeddc0ba7b241973828a22aa57acb3268f6d26d1e8
parent8f2ff2a64824d0a7b7ded83c10b0a0c1764d1fd1 (diff)
downloadsqlalchemy-b93eb67f4be65568452cfcd3ef507337d5ccc8d4.tar.gz
- Squashed 2.4 generators.
-rw-r--r--lib/sqlalchemy/orm/strategies.py2
-rw-r--r--test/testlib/testing.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index e59114577..4028eed6a 100644
--- 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 69b5d8fed..cf0936e92 100644
--- 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)))