0.6.0 prep

diff --git a/CHANGES b/CHANGES
index b254b0a01fcc134f9c0937073c423b982dc251de..7edcc9b8a959bcceff4599ed58baa2a037a75293 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,9 @@
 CHANGES
 =======
 
-0.6uow_refactor
-===============
+0.6.0
+=====
+
 - orm
   - Unit of work internals have been rewritten.  Units of work
     with large numbers of objects interdependent objects 
@@ -19,18 +20,14 @@ CHANGES
     work to be done, filtered through a single topological sort 
     for correct ordering.  Flush actions are assembled using 
     far fewer steps and less memory. [ticket:1742]
-  
+
   - one-to-many relationships now maintain a list of positive
     parent-child associations within the flush, preventing
     previous parents marked as deleted from cascading a 
     delete or NULL foreign key set on those child objects,
     despite the end-user not removing the child from the old
     association. [ticket:1764]
-  
-0.6.0
-=====
 
-- orm
   - A collection lazy load will switch off default 
     eagerloading on the reverse many-to-one side, since 
     that loading is by definition unnecessary.  [ticket:1495]

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 774ac24d94089ccc6d96c6d6a44fda714b830c30..30d357fd69fe7bdfddbfda49d34b2ad7dac21e15 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -114,6 +114,6 @@ from sqlalchemy.engine import create_engine, engine_from_config
 __all__ = sorted(name for name, obj in locals().items()
                  if not (name.startswith('_') or inspect.ismodule(obj)))
                  
-__version__ = '0.6uow_refactor'
+__version__ = '0.6.0'
 
 del inspect, sys

diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 731b21549c97755dba3f06539a2959a97f44d9e7..624035c686891c51656029fc1dd5c7cf21ade212 100644 (file)
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -168,9 +168,6 @@ class DependencyProcessor(object):
             if not sum_:
                 continue
 
-            # I'd like to emit the before_delete/after_save actions
-            # here and have the unit of work not get confused by that
-            # when it alters the list of dependencies...
             if isdelete:
                 before_delete = unitofwork.ProcessState(uow, self, True, state)
                 if parent_in_cycles: