summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-12-05 20:55:33 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-12-05 20:55:33 +0000
commit9629838f7dceab972c70938b58b7ec1ff44739e2 (patch)
tree3d9ce7f2f4bd3d06e0e1f581057f5773ccb07a1f /lib/sqlalchemy
parent9e4052dc8be2451d1c48bb059da150ce41ddc86f (diff)
downloadsqlalchemy-9629838f7dceab972c70938b58b7ec1ff44739e2.tar.gz
- fixed wrong varname in session exception throw
- fixed vertical example to just use a scoped session
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index bb025a3ab..5f8602105 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -993,7 +993,7 @@ class Session(object):
if not hasattr(instance, '_instance_key'):
raise exceptions.InvalidRequestError("Instance '%s' is not persisted" % mapperutil.instance_str(instance))
elif self.identity_map.get(instance._instance_key, instance) is not instance:
- raise exceptions.InvalidRequestError("Could not update instance '%s', identity key %s; a different instance with the same identity key already exists in this session." % (mapperutil.instance_str(obj), obj._instance_key))
+ raise exceptions.InvalidRequestError("Could not update instance '%s', identity key %s; a different instance with the same identity key already exists in this session." % (mapperutil.instance_str(instance), instance._instance_key))
self._attach(instance)
def _save_or_update_impl(self, instance, entity_name=None):