From: Jason Kirtland <jek@discorporate.us>
Date: Sun, 28 Sep 2008 00:04:09 +0000 (+0000)
Subject: Tidy.
X-Git-Tag: rel_0_5rc2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f1a5df20291f77a0a6e83ba9dd5527034237ad;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Tidy.
---

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index b557e0232e..6ea28148d9 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -179,9 +179,8 @@ class _ScopedExt(MapperExtension):
     def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):
         if self.save_on_init:
             session = kwargs.pop('_sa_session', None)
-
-        if self.save_on_init:
-            session = session or self.context.registry()
+            if session is None:
+                session = self.context.registry()
             session._save_without_cascade(instance)
         return EXT_CONTINUE