[z3-checkins] r19372 - in z3/Five/trunk: . tests

[efge at codespeak.net]

Author: efge
Date: Tue Nov  1 21:06:57 2005
New Revision: 19372

Modified:
   z3/Five/trunk/eventconfigure.py
   z3/Five/trunk/tests/event.txt
   z3/Five/trunk/tests/test_event.py
Log:
Merged 19371 from Five-1.2 branch: Do proper cleanups.
Also removed improper warnings during the tests.



Modified: z3/Five/trunk/eventconfigure.py
==============================================================================
--- z3/Five/trunk/eventconfigure.py	(original)
+++ z3/Five/trunk/eventconfigure.py	Tue Nov  1 21:06:57 2005
@@ -30,6 +30,9 @@
     """Instances of the class will still see their old methods called."""
     deprecatedManageAddDeleteClasses.append(class_)
 
+def cleanUp():
+    deprecatedManageAddDeleteClasses[:] = []
+
 def containerEvents(_context):
     _context.action(
         discriminator=None,
@@ -43,3 +46,7 @@
         callable=setDeprecatedManageAddDelete,
         args=(class_,),
         )
+
+from zope.testing.cleanup import addCleanUp
+addCleanUp(cleanUp)
+del addCleanUp

Modified: z3/Five/trunk/tests/event.txt
==============================================================================
--- z3/Five/trunk/tests/event.txt	(original)
+++ z3/Five/trunk/tests/event.txt	Tue Nov  1 21:06:57 2005
@@ -118,6 +118,7 @@
   >>> from Products.Five.eventconfigure import setDeprecatedManageAddDelete
   >>> setDeprecatedManageAddDelete(MyContent)
   >>> setDeprecatedManageAddDelete(MyFolder)
+  >>> setDeprecatedManageAddDelete(MyOrderedFolder)
 
 Now some events are sent but the old manage_afterAdd method is also
 called correctly::

Modified: z3/Five/trunk/tests/test_event.py
==============================================================================
--- z3/Five/trunk/tests/test_event.py	(original)
+++ z3/Five/trunk/tests/test_event.py	Tue Nov  1 21:06:57 2005
@@ -40,14 +40,11 @@
     def manage_afterAdd(self, item, container):
         print 'old manage_afterAdd %s %s %s' % (self.getId(), item.getId(),
                                                 container.getId())
-        super(NotifyBase, self).manage_afterAdd(item, container)
     def manage_beforeDelete(self, item, container):
-        super(NotifyBase, self).manage_beforeDelete(item, container)
         print 'old manage_beforeDelete %s %s %s' % (self.getId(), item.getId(),
                                                     container.getId())
     def manage_afterClone(self, item):
         print 'old manage_afterClone %s %s' % (self.getId(), item.getId())
-        super(NotifyBase, self).manage_afterClone(item)
 
 class MyApp(Folder):
     def getPhysicalRoot(self):