From b93eb67f4be65568452cfcd3ef507337d5ccc8d4 Mon Sep 17 00:00:00 2001 From: Jason Kirtland Date: Tue, 1 Apr 2008 18:31:20 +0000 Subject: [PATCH] - Squashed 2.4 generators. --- lib/sqlalchemy/orm/strategies.py | 2 +- test/testlib/testing.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index e591145774..4028eed6a4 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 69b5d8fedc..cf0936e922 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))) -- 2.47.3