From: schettino72 <schettino72@gmail.com>
Date: Mon, 25 Nov 2013 01:18:34 +0000 (+1300)
Subject: orm.collection, list.clear(). remove 'before_delete()', added unit-test.
X-Git-Tag: rel_0_9_0~67^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fc91105a0ee484fb9c76e7e957c78a5f1901ddb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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 fd1677058e..ffd0b8c379 100644
--- 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 f6493f1a8c..f94c742b35 100644
--- 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()]