Tidy.

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index b557e0232e92bb42c3b79afaf45fd758d864e80f..6ea28148d92b252ba12253d27a4803d21af1aef5 100644 (file)
--- 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