summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/scoping.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-09-28 00:04:09 +0000
committerJason Kirtland <jek@discorporate.us>2008-09-28 00:04:09 +0000
commit15f1a5df20291f77a0a6e83ba9dd5527034237ad (patch)
tree0f3643efcddf02af51e16c0597a9f4f2ff215fc5 /lib/sqlalchemy/orm/scoping.py
parent17309da8e611e016eaca30bc00376fe57b6d94c7 (diff)
downloadsqlalchemy-15f1a5df20291f77a0a6e83ba9dd5527034237ad.tar.gz
Tidy.
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r--lib/sqlalchemy/orm/scoping.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index b557e0232..6ea28148d 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