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

---

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index d6b1fe0537..ef585b6a21 100644
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -171,9 +171,6 @@ 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)
@@ -194,7 +191,7 @@ class UnitOfWork(object):
                     commit_context.append_task(obj)
         else:
             for obj in [n for n in self.new] + [d for d in self.dirty]:
-                #if obj.__class__.__name__ == 'Order': print "going to save.... " + obj.__class__.__name__ + repr(id(obj)) + repr(obj.__dict__)
+                #print "going to save.... " + obj.__class__.__name__ + repr(id(obj)) 
                 if self.deleted.contains(obj):
                     continue
                 commit_context.append_task(obj)
@@ -443,7 +440,8 @@ class UOWTask(object):
                 if self.isdelete:
                     childlist = childlist.unchanged_items() + childlist.deleted_items()
                 else:
-                    childlist = childlist.added_items() + childlist.deleted_items()
+                    #childlist = childlist.added_items() + childlist.deleted_items()
+                    childlist = childlist.added_items()
                 for o in childlist:
                     whosdep = processor.whose_dependent_on_who(obj, o, trans)
                     if whosdep is not None: