diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-27 18:24:00 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-12-27 18:24:00 +0000 |
| commit | f80471e6f385739ee23b96dfe4aa3a48fbc8e1fd (patch) | |
| tree | c00b68e2b712472aef02ae536c8902edbc5c88f6 /lib | |
| parent | fbcaa34b9edb9c7088e630ab7ed337273e6b6d6e (diff) | |
| download | sqlalchemy-f80471e6f385739ee23b96dfe4aa3a48fbc8e1fd.tar.gz | |
- Added ScopedSession.is_active accessor. [ticket:976]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 6e33be96b..5559784c7 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -129,7 +129,7 @@ def makeprop(name): def get(self): return getattr(self.registry(), name) return property(get, set) -for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map'): +for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map', 'is_active'): setattr(ScopedSession, prop, makeprop(prop)) def clslevel(name): diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index eb003fda2..3bc3fb4fc 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -526,7 +526,7 @@ class Session(object): public_methods = ( '__contains__', '__iter__', 'add', 'add_all', 'begin', 'begin_nested', 'clear', 'close', 'commit', 'connection', 'delete', 'execute', 'expire', - 'expire_all', 'expunge', 'flush', 'get_bind', 'is_modified', + 'expire_all', 'expunge', 'flush', 'get_bind', 'is_modified', 'merge', 'query', 'refresh', 'rollback', 'save', 'save_or_update', 'scalar', 'update') |