summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-12-27 18:23:24 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-12-27 18:23:24 +0000
commit2f19d81a087a65af9ba2e20bdfbe39ee8c52aa11 (patch)
tree2c1efb7cfd5e27dc2c44a50a18202fb8292443c4
parent1993e0c3bf05f78f6b6d8422d23846611fac92ae (diff)
downloadsqlalchemy-2f19d81a087a65af9ba2e20bdfbe39ee8c52aa11.tar.gz
unit tests in 0.5 revealed the proper way to do this
-rw-r--r--lib/sqlalchemy/orm/scoping.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index d453909a1..17d9cbf4c 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -97,7 +97,7 @@ def instrument(name):
def do(self, *args, **kwargs):
return getattr(self.registry(), name)(*args, **kwargs)
return do
-for meth in ('add', 'add_all', 'get', 'load', 'close', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', 'is_active', '__contains__', '__iter__'):
+for meth in ('add', 'add_all', 'get', 'load', 'close', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', '__contains__', '__iter__'):
setattr(ScopedSession, meth, instrument(meth))
def makeprop(name):
@@ -106,7 +106,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):