diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-22 13:00:38 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-22 13:00:38 -0400 |
| commit | 1a08c41048efd204959f47804b7006c351cae04b (patch) | |
| tree | 37e9c30e8c243e13a71571eb2886a811663a400b /lib/sqlalchemy/orm/scoping.py | |
| parent | 2574ca4b215cb06720d3ff4352d87ce87ebdd160 (diff) | |
| download | sqlalchemy-1a08c41048efd204959f47804b7006c351cae04b.tar.gz | |
Remove "scope" keyword from scoped_session.__call__()
Removed a very old keyword argument from :class:`.scoped_session`
called ``scope``. This keyword was never documented and was an
early attempt at allowing for variable scopes.
Change-Id: I9a26498a1a66d1eafb0723e98b527688a60f9d9b
Fixes: #3796
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 05b881320..055ec7d6a 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() |