From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 25 Feb 2012 19:38:00 +0000 (-0500)
Subject: plus add it to the scoping namespace
X-Git-Tag: rel_0_7_6~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa70505df582e29bc857d9e10c60c7a1cbcc0f68;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

plus add it to the scoping namespace
---

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index ffc8ef4a1c..3c1cd7f26d 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -41,8 +41,9 @@ class ScopedSession(object):
             scope = kwargs.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.")
+                    raise sa_exc.InvalidRequestError(
+                            "Scoped session is already present; "
+                            "no new arguments may be specified.")
                 else:
                     sess = self.session_factory(**kwargs)
                     self.registry.set(sess)
@@ -70,8 +71,8 @@ class ScopedSession(object):
         self.session_factory.configure(**kwargs)
 
     def query_property(self, query_cls=None):
-        """return a class property which produces a `Query` object against the
-        class when called.
+        """return a class property which produces a `Query` object 
+        against the class when called.
 
         e.g.::
 
@@ -121,7 +122,8 @@ def makeprop(name):
     def get(self):
         return getattr(self.registry(), name)
     return property(get, set)
-for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map', 'is_active', 'autoflush'):
+for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map', 
+                'is_active', 'autoflush', 'no_autoflush'):
     setattr(ScopedSession, prop, makeprop(prop))
 
 def clslevel(name):