summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/scoping.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-08-29 20:23:02 +0000
committerJason Kirtland <jek@discorporate.us>2007-08-29 20:23:02 +0000
commitcdde69e7bdef6d9a8a074d1051e099e217d33acf (patch)
tree5153eff88547e83d87c705ad7017e02150874171 /lib/sqlalchemy/orm/scoping.py
parent59ace15998e1e2e5752ba0f86398164af6c2f186 (diff)
downloadsqlalchemy-cdde69e7bdef6d9a8a074d1051e099e217d33acf.tar.gz
Fix for scoped_session's `mapper(extension=<scalar>)` [ticket:760]
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r--lib/sqlalchemy/orm/scoping.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index aebcfcdfe..caa46670b 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -51,7 +51,7 @@ class ScopedSession(object):
from sqlalchemy.orm import mapper
validate = kwargs.pop('validate', False)
- extension = to_list(kwargs.setdefault('extension', []))
+ kwargs['extension'] = extension = to_list(kwargs.get('extension', []))
if validate:
extension.append(self.extension.validating())
else: