[Zope3-checkins] CVS: Zope3/src/zope/app/event - __init__.py:1.6 objectevent.py:1.3 subs.py:1.6

[Sidnei da Silva]

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

Modified Files:
	__init__.py objectevent.py subs.py 
Log Message:
Merging paris-copypasterename-branch. Not very fun :(

=== Zope3/src/zope/app/event/__init__.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/event/__init__.py:1.5	Wed Feb  5 23:30:43 2003
+++ Zope3/src/zope/app/event/__init__.py	Tue Feb 11 10:59:44 2003
@@ -12,8 +12,8 @@
 # 
 ##############################################################################
 """
-
 Revision information:
+
 $Id$
 """
 


=== Zope3/src/zope/app/event/objectevent.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/event/objectevent.py:1.2	Wed Dec 25 09:12:51 2002
+++ Zope3/src/zope/app/event/objectevent.py	Tue Feb 11 10:59:44 2003
@@ -21,6 +21,7 @@
 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 IObjectCopiedEvent
 from zope.app.interfaces.event import IObjectAnnotationsModifiedEvent
 from zope.app.interfaces.event import IObjectContentModifiedEvent
 from zope.app.traversing import getPhysicalPath
@@ -73,7 +74,6 @@
 
     __implements__ = IObjectRemovedEvent
 
-
 class ObjectMovedEvent(ObjectAddedEvent):
     """An object has been moved"""
 
@@ -83,4 +83,15 @@
 
     def __init__(self, object, from_location, to_location):
         super(ObjectMovedEvent, self).__init__(object, to_location)
+        self.fromLocation = from_location
+
+class ObjectCopiedEvent(ObjectAddedEvent):
+    """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


=== Zope3/src/zope/app/event/subs.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/event/subs.py:1.5	Wed Feb  5 23:30:43 2003
+++ Zope3/src/zope/app/event/subs.py	Tue Feb 11 10:59:44 2003
@@ -13,6 +13,7 @@
 ##############################################################################
 """
 Revision information:
+
 $Id$
 """
 from __future__ import generators