- Added ScopedSession.is_active accessor. [ticket:976]

diff --git a/CHANGES b/CHANGES
index 302b9c7f7d2b69ed6a902ba939dfb58bfb00a6fb..457c7fc0a1f33fb47078cf95ca1eb50c26c01abd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ CHANGES
     - Fixed bug in composite types which prevented a primary-key
       composite type from being mutated [ticket:1213].
 
+    - Added ScopedSession.is_active accessor. [ticket:976]
 - sql
     - Connection.invalidate() checks for closed status 
       to avoid attribute errors. [ticket:1246]

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 90bc703fe8f007a735ec8c4eef2397646babe1ed..d453909a1a01d775333629498bce8b52be3cf288 100644 (file)
--- 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', '__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', 'is_active', '__contains__', '__iter__'):
     setattr(ScopedSession, meth, instrument(meth))
 
 def makeprop(name):