[Zope3-checkins] CVS: Zope3/src/zope/app/event - objectevent.py:1.6.24.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/event
In directory cvs.zope.org:/tmp/cvs-serv13470/src/zope/app/event

Modified Files:
      Tag: parentgeddon-branch
	objectevent.py 
Log Message:
Can't have the tests passing, can we?

=== Zope3/src/zope/app/event/objectevent.py 1.6 => 1.6.24.1 ===
--- Zope3/src/zope/app/event/objectevent.py:1.6	Sat Jun  7 03:23:51 2003
+++ Zope3/src/zope/app/event/objectevent.py	Fri Sep 12 15:15:24 2003
@@ -19,8 +19,7 @@
 __metaclass__ = type
 
 from zope.app.interfaces.event import IObjectEvent, IObjectCreatedEvent
-from zope.app.interfaces.event import IObjectAddedEvent, IObjectModifiedEvent
-from zope.app.interfaces.event import IObjectRemovedEvent, IObjectMovedEvent
+from zope.app.interfaces.event import IObjectModifiedEvent
 from zope.app.interfaces.event import IObjectCopiedEvent
 from zope.app.interfaces.event import IObjectAnnotationsModifiedEvent
 from zope.app.interfaces.event import IObjectContentModifiedEvent
@@ -45,11 +44,6 @@
         self.object = object
         self.__location = location
 
-class ObjectAddedEvent(ObjectEvent):
-    """An object has been added to a container"""
-
-    implements(IObjectAddedEvent)
-
 class ObjectCreatedEvent(ObjectEvent):
     """An object has been created"""
 
@@ -70,29 +64,7 @@
 
     implements(IObjectContentModifiedEvent)
 
-class ObjectRemovedEvent(ObjectEvent):
-    """An object has been removed from a container"""
-
-    implements(IObjectRemovedEvent)
-
-class ObjectMovedEvent(ObjectAddedEvent):
-    """An object has been moved"""
-
-    implements(IObjectMovedEvent)
-
-    fromLocation = None
-
-    def __init__(self, object, from_location, to_location):
-        super(ObjectMovedEvent, self).__init__(object, to_location)
-        self.fromLocation = from_location
-
-class ObjectCopiedEvent(ObjectAddedEvent):
+class ObjectCopiedEvent(ObjectCreatedEvent):
     """An object has been copied"""
 
     implements(IObjectCopiedEvent)
-
-    fromLocation = None
-
-    def __init__(self, object, from_location, to_location):
-        super(ObjectCopiedEvent, self).__init__(object, to_location)
-        self.fromLocation = from_location