summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/objectstore.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-11-03 03:24:41 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-11-03 03:24:41 +0000
commitfe4be9aa606936119cd2b79a970ab71d1746dba1 (patch)
tree921f98aa3b13f476148f0cc4bf675b32f1edbb7f /lib/sqlalchemy/objectstore.py
parentba8d9883b4a4349fb43b9918973716fe880f9bf8 (diff)
downloadsqlalchemy-fe4be9aa606936119cd2b79a970ab71d1746dba1.tar.gz
Diffstat (limited to 'lib/sqlalchemy/objectstore.py')
-rw-r--r--lib/sqlalchemy/objectstore.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index 3d5b3851f..e14c2fd7a 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -147,7 +147,10 @@ class UnitOfWork(object):
def _remove_deleted(self, obj):
if hasattr(obj, "_instance_key"):
del self.identity_map[obj._instance_key]
- del self.deleted[obj]
+ try:
+ del self.deleted[obj]
+ except KeyError:
+ pass
try:
del self.dirty[obj]
except KeyError: