[Zope-Checkins] SVN: Products.Five/branches/1.4/ Revert fix for #2307 (for now) as half of Plonistan is running Zope 2.9.7

[Stefan H. Holek]

Log message for revision 76909:
  Revert fix for #2307 (for now) as half of Plonistan is running Zope 2.9.7
  with Five 1.4 branch -- and they are complaining noisily.
  

Changed:
  U   Products.Five/branches/1.4/CHANGES.txt
  U   Products.Five/branches/1.4/event.zcml
  U   Products.Five/branches/1.4/tests/event.txt

-=-
Modified: Products.Five/branches/1.4/CHANGES.txt
===================================================================
--- Products.Five/branches/1.4/CHANGES.txt	2007-06-21 17:51:02 UTC (rev 76908)
+++ Products.Five/branches/1.4/CHANGES.txt	2007-06-21 17:56:43 UTC (rev 76909)
@@ -2,15 +2,12 @@
 Five Changes
 ============
 
-Five 1.4.3 (svn/unreleased)
-===========================
+Five 1.4.3 (unreleased)
+=======================
 
 Bugfixes
 --------
 
-* ObjectCopiedEvent was not dispatched to sublocations.
-  (http://www.zope.org/Collectors/Zope/2307)
-
 * Relaxed requirements for context of browser.pagetemplatefile's 
   ZopeTwoPageTemplateFile, to reduce barriers for testing renderability
   of views which use them. (http://www.zope.org/Collectors/Zope/2327)

Modified: Products.Five/branches/1.4/event.zcml
===================================================================
--- Products.Five/branches/1.4/event.zcml	2007-06-21 17:51:02 UTC (rev 76908)
+++ Products.Five/branches/1.4/event.zcml	2007-06-21 17:56:43 UTC (rev 76909)
@@ -33,12 +33,4 @@
       handler="OFS.subscribers.dispatchObjectClonedEvent"
       />
 
-  <!-- dispatch IObjectCopiedEvent with "top-down" semantics -->
-
-  <subscriber
-      for="OFS.interfaces.IItem
-           zope.app.event.interfaces.IObjectCopiedEvent"
-      handler="OFS.subscribers.dispatchObjectCopiedEvent"
-      />
-
 </configure>

Modified: Products.Five/branches/1.4/tests/event.txt
===================================================================
--- Products.Five/branches/1.4/tests/event.txt	2007-06-21 17:51:02 UTC (rev 76908)
+++ Products.Five/branches/1.4/tests/event.txt	2007-06-21 17:56:43 UTC (rev 76909)
@@ -60,7 +60,6 @@
 
   >>> from zope.app.event.interfaces import IObjectEvent
   >>> from zope.app.container.interfaces import IObjectMovedEvent
-  >>> from zope.app.event.interfaces import IObjectCopiedEvent
   >>> from OFS.interfaces import IObjectWillBeMovedEvent
   >>> from OFS.interfaces import IObjectClonedEvent
   >>> from OFS.interfaces import IItem
@@ -68,7 +67,6 @@
   ...     print event.__class__.__name__, object.getId()
   >>> def printObjectEventExceptSome(object, event):
   ...     if (IObjectMovedEvent.providedBy(event) or
-  ...         IObjectCopiedEvent.providedBy(event) or
   ...         IObjectWillBeMovedEvent.providedBy(event) or
   ...         IObjectClonedEvent.providedBy(event)):
   ...         return
@@ -76,7 +74,6 @@
 
   >>> from zope.component import provideHandler
   >>> provideHandler(printObjectEvent, (IItem, IObjectMovedEvent))
-  >>> provideHandler(printObjectEvent, (IItem, IObjectCopiedEvent))
   >>> provideHandler(printObjectEvent, (IItem, IObjectWillBeMovedEvent))
   >>> provideHandler(printObjectEvent, (IItem, IObjectClonedEvent))
   >>> provideHandler(printObjectEventExceptSome, (None, IObjectEvent))
@@ -137,7 +134,6 @@
 
   >>> res = folder.manage_clone(folder.marine, 'tank')
   ObjectCopiedEvent tank
-  ObjectCopiedEvent dog
   ObjectWillBeAddedEvent tank
   ObjectWillBeAddedEvent dog
   ObjectAddedEvent tank
@@ -287,7 +283,6 @@
 
   >>> res = folder.manage_clone(folder.pluto, 'mickey')
   ObjectCopiedEvent mickey
-  ObjectCopiedEvent donald
   ObjectWillBeAddedEvent mickey
   ObjectWillBeAddedEvent donald
   ObjectAddedEvent mickey
@@ -420,7 +415,6 @@
 
   >>> res = folder.manage_clone(folder.firefly, 'serenity')
   ObjectCopiedEvent serenity
-  ObjectCopiedEvent mel
   ObjectWillBeAddedEvent serenity
   ObjectWillBeAddedEvent mel
   ObjectAddedEvent serenity