[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - objecthubsetup.py:1.14 test_eventservice.py:1.32 test_objecthub.py:1.17

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv7455/services/tests

Modified Files:
	objecthubsetup.py test_eventservice.py test_objecthub.py 
Log Message:
Moved event interfaces from zope.app.interfaces.event to
zope.app.event.interfaces.


=== Zope3/src/zope/app/services/tests/objecthubsetup.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/services/tests/objecthubsetup.py:1.13	Sun Sep 21 13:33:07 2003
+++ Zope3/src/zope/app/services/tests/objecthubsetup.py	Tue Mar  2 13:51:04 2004
@@ -23,7 +23,7 @@
 from zope.app.traversing import traverse, canonicalPath
 
 from zope.app.interfaces.container import IObjectAddedEvent, IObjectMovedEvent
-from zope.app.interfaces.event import ISubscriber
+from zope.app.event.interfaces import ISubscriber
 
 from zope.interface import implements
 


=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.31 => 1.32 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.31	Mon Feb  9 04:07:44 2004
+++ Zope3/src/zope/app/services/tests/test_eventservice.py	Tue Mar  2 13:51:04 2004
@@ -12,38 +12,38 @@
 #
 ##############################################################################
 """
-
-Revision information:
 $Id$
 """
 
 from unittest import TestCase, TestLoader, TextTestRunner
+
+import zope.interface
 from zope.interface import Interface, implements
+from zope.exceptions import NotFoundError
+from zope.component.tests.components import RecordingAdapter
+
 from zope.app.services.servicenames import EventPublication, EventSubscription
 from zope.app.services.event import EventService
-from zope.app.traversing import getPath, traverse
-from zope.exceptions import NotFoundError
 from zope.app.services.event import subscribe, unsubscribe, unsubscribeAll
 from zope.app.services.event import getSubscriptionService
+
 from zope.app.event import publish
 from zope.app.event.tests.subscriber import DummySubscriber, DummyFilter
-from zope.app.interfaces.event import IObjectEvent, IObjectModifiedEvent
+from zope.app.event.interfaces import IObjectEvent, IObjectModifiedEvent
+from zope.app.event.objectevent import ObjectModifiedEvent
+from zope.app.event.interfaces import IEvent, ISubscriber, ISubscribingAware
+
+from zope.app.traversing import getPath, traverse
+from zope.app.interfaces.traversing import IContainmentRoot
 from zope.app.interfaces.container import IObjectAddedEvent
 from zope.app.interfaces.container import IObjectRemovedEvent
-from zope.app.interfaces.event import ISubscriber
-from zope.app.container.contained import ObjectAddedEvent
-from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.app.interfaces.event import IEvent, ISubscribingAware
+from zope.app.container.contained import ObjectAddedEvent, Contained
 from zope.app.interfaces.services.registration import RegisteredStatus
 from zope.app.services.tests.eventsetup import EventSetup
-from zope.component.tests.components import RecordingAdapter
 from zope.app.tests import ztapi
 from zope.app.interfaces.services.service import ISimpleService
 from zope.app.services.event import EventService
 from zope.app.tests import setup
-from zope.app.container.contained import Contained
-from zope.app.interfaces.traversing import IContainmentRoot
-import zope.interface
 
 class Folder(Contained):
     pass


=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.16	Tue Dec 16 17:05:40 2003
+++ Zope3/src/zope/app/services/tests/test_objecthub.py	Tue Mar  2 13:51:04 2004
@@ -13,7 +13,6 @@
 ##############################################################################
 """testObjectHub
 
-Revision information:
 $Id$
 """
 
@@ -22,7 +21,7 @@
 from zope.app import zapi
 from zope.app.services.tests.objecthubsetup import ObjectHubSetup
 
-from zope.app.interfaces.event import IObjectModifiedEvent
+from zope.app.event.interfaces import IObjectModifiedEvent
 from zope.app.interfaces.container import IObjectAddedEvent
 from zope.app.interfaces.container import IObjectRemovedEvent
 from zope.app.interfaces.container import IObjectMovedEvent