summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/unitofwork.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-07-10 20:38:40 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-07-10 20:38:40 +0000
commit0c64a8ab5c05eb830f40980ded7fab541b1ca932 (patch)
tree85f6fc0a04bedaff04b916ece869416cb45df085 /lib/sqlalchemy/orm/unitofwork.py
parentd947d6b79db6c1aad4b12668252c1ee181641923 (diff)
downloadsqlalchemy-0c64a8ab5c05eb830f40980ded7fab541b1ca932.tar.gz
fixed small expunge() bug where object might not be present in session
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
-rw-r--r--lib/sqlalchemy/orm/unitofwork.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index c6b0b2689..5f28d28e7 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -108,7 +108,7 @@ class UnitOfWork(object):
echo = logging.echo_property()
def _remove_deleted(self, obj):
- if hasattr(obj, "_instance_key"):
+ if hasattr(obj, "_instance_key") and obj._instance_key in self.identity_map:
del self.identity_map[obj._instance_key]
try:
self.deleted.remove(obj)