orm.collection, list.clear(). remove 'before_delete()', added unit-test.

diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index fd1677058ea220093e24bb90ead5b37d662ffe6f..ffd0b8c379bc2b6b4a28c3299b97b23a73d25283 100644 (file)
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -1163,7 +1163,6 @@ def _list_decorators():
 
     def clear(fn):
         def clear(self, index=-1):
-            __before_delete(self)
             for item in self:
                 __del(self, item)
             fn(self)

diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py
index f6493f1a8cc7e289d4789e8c120e991908f33288..f94c742b358162a1e50873fd730947423146b1b4 100644 (file)
--- a/test/orm/test_collection.py
+++ b/test/orm/test_collection.py
@@ -284,6 +284,16 @@ class CollectionsTest(fixtures.ORMTest):
             del control[:]
             assert_eq()
 
+        if hasattr(direct, 'clear'):
+            for i in range(1, 4):
+                e = creator()
+                direct.append(e)
+                control.append(e)
+
+            direct.clear()
+            control.clear()
+            assert_eq()
+
         if hasattr(direct, 'extend'):
             values = [creator(), creator(), creator()]