summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/scoping.py
diff options
context:
space:
mode:
authorzhulongcheng <zhulongcheng.me@gmail.com>2016-09-14 21:16:26 +0800
committerzhulongcheng <zhulongcheng.me@gmail.com>2016-09-14 21:16:26 +0800
commit535a1cfecdea91c63a3a1ebc43c16b37bfcca8f9 (patch)
tree4dcf2e800c98ec9849fd73890fd06ce52c4fa5c8 /lib/sqlalchemy/orm/scoping.py
parentc3d582d87b5bd404d380c5707f35b7a20c9828fc (diff)
downloadsqlalchemy-pr/307.tar.gz
fix scope_session.__call__pr/307
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r--lib/sqlalchemy/orm/scoping.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 6306514cb..e3472e940 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -62,18 +62,14 @@ class scoped_session(object):
"""
if kw:
- scope = kw.pop('scope', False)
- if scope is not None:
- if self.registry.has():
- raise sa_exc.InvalidRequestError(
- "Scoped session is already present; "
- "no new arguments may be specified.")
- else:
- sess = self.session_factory(**kw)
- self.registry.set(sess)
- return sess
+ if self.registry.has():
+ raise sa_exc.InvalidRequestError(
+ "Scoped session is already present; "
+ "no new arguments may be specified.")
else:
- return self.session_factory(**kw)
+ sess = self.session_factory(**kw)
+ self.registry.set(sess)
+ return sess
else:
return self.registry()