decruftify UOW some more....uowdumper always prints out based on

polymorphic collections

diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index a5feefeeb146191c9b80c9768a18dc80a51bb4ce..732970cad2349b8a2e8aeeb317bd13ddb1dc7fbb 100644 (file)
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -656,15 +656,9 @@ class UOWTask(object):
     polymorphic_tosave_elements = property(lambda self: [rec for rec in self.polymorphic_elements
                                              if not rec.isdelete])
                                              
-    tosave_elements = property(lambda self: [rec for rec in self.elements
-                                             if not rec.isdelete])
-
     polymorphic_todelete_elements = property(lambda self:[rec for rec in self.polymorphic_elements
                                                if rec.isdelete])
 
-    todelete_elements = property(lambda self:[rec for rec in self.elements
-                                              if rec.isdelete])
-
     polymorphic_tosave_objects = property(lambda self:[rec.obj for rec in self.polymorphic_elements
                                           if rec.obj is not None and not rec.listonly and rec.isdelete is False])
 

diff --git a/lib/sqlalchemy/orm/uowdumper.py b/lib/sqlalchemy/orm/uowdumper.py
index d41e9660ea82c647b283f0e73aa8e25ae466d876..22b0ec828322b8c88dea6c755ee13d36f116bc16 100644 (file)
--- a/lib/sqlalchemy/orm/uowdumper.py
+++ b/lib/sqlalchemy/orm/uowdumper.py
@@ -135,9 +135,9 @@ class UOWDumper(unitofwork.UOWExecutor):
 
     def _dump_processor(self, proc, deletes):
         if deletes:
-            val = proc.targettask.todelete_elements
+            val = proc.targettask.polymorphic_todelete_elements
         else:
-            val = proc.targettask.tosave_elements
+            val = proc.targettask.polymorphic_tosave_elements
 
         if self.verbose:
             self.buf.write(self._indent() + "   |- %s attribute on %s (UOWDependencyProcessor(%d) processing %s)\n" % (