summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-04-17 06:44:44 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-04-17 06:44:44 -0400
commit3cefadd926fdb470bf0672ed10b76685b8d32638 (patch)
tree9a99e938980a482b4afee7e421a80e65b3626d96 /lib/sqlalchemy/orm/session.py
parentd72b327786d663b3954df345c6afc30e8e6f91fc (diff)
downloadsqlalchemy-3cefadd926fdb470bf0672ed10b76685b8d32638.tar.gz
a little bit of refinement
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-rw-r--r--lib/sqlalchemy/orm/session.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 391e78fdb..7641905f0 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1337,7 +1337,8 @@ class Session(object):
if objects:
util.warn_deprecated(
"The 'objects' argument to session.flush() is deprecated; "
- "Please do not add objects to the session which should not yet be persisted.")
+ "Please do not add objects to the session which should not "
+ "yet be persisted.")
if self._flushing:
raise sa_exc.InvalidRequestError("Session is already flushing")
@@ -1400,7 +1401,10 @@ class Session(object):
["any parent '%s' instance "
"via that classes' '%s' attribute" %
(cls.__name__, key)
- for (key, cls) in chain(*(m.delete_orphans for m in _state_mapper(state).iterate_to_root()))])
+ for (key, cls) in chain(*(
+ m.delete_orphans for m in _state_mapper(state).iterate_to_root()
+ ))
+ ])
raise exc.FlushError(
"Instance %s is an unsaved, pending instance and is an "
"orphan (is not attached to %s)" % (