From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 5 Oct 2005 04:46:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=475ac522549f2aa449afcb64d96e2c37b616b493;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index c930e19ebf..d6b1fe0537 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -171,6 +171,9 @@ class UnitOfWork(object):
             return True
         
     def register_deleted(self, obj):
+        try:
+            del self.dirty[obj]
+        except KeyError:pass
         self.deleted.append(obj)  
         mapper = object_mapper(obj)
         mapper.register_deleted(obj, self)