[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - eventsetup.py:1.3 placefulsetup.py:1.4 test_objecthub.py:1.4

[Steve Alexander]

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

Modified Files:
	eventsetup.py placefulsetup.py test_objecthub.py 
Log Message:
Compressed various independent modules in zope.app.traversing into 
far fewer modules.
Also, changed the place where the textindex lives to one level higher.


=== Zope3/src/zope/app/services/tests/eventsetup.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/eventsetup.py:1.2	Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/eventsetup.py	Sat Dec 28 12:49:32 2002
@@ -17,20 +17,10 @@
 $Id$
 """
 
-from zope.app.services.tests.placefulsetup \
-  import PlacefulSetup
-
-from zope.app.services.service \
-     import ServiceManager
-
-from zope.app.services.event \
-     import LocalEventService
-
-from zope.app.services.service \
-     import ServiceConfiguration
-
+from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.services.service import ServiceManager, ServiceConfiguration
+from zope.app.services.event import LocalEventService
 from zope.app.traversing import getPhysicalPathString, traverse
-
 from zope.app.interfaces.services.configuration import Active
 
 class EventSetup(PlacefulSetup):


=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.3	Sat Dec 28 09:13:28 2002
+++ Zope3/src/zope/app/services/tests/placefulsetup.py	Sat Dec 28 12:49:32 2002
@@ -31,12 +31,11 @@
 from zope.app.interfaces.traversing import ITraverser
 from zope.app.interfaces.traversing import ITraversable
 from zope.app.tests.placelesssetup import PlacelessSetup
-from zope.app.traversing.defaulttraversable import DefaultTraversable
-from zope.app.traversing.etcnamespace import etc
-from zope.app.traversing.namespaces import provideNamespaceHandler
-from zope.app.traversing.physicallocationadapters \
-     import WrapperPhysicallyLocatable, RootPhysicallyLocatable
-from zope.app.traversing.traverser import Traverser
+from zope.app.traversing.adapters import DefaultTraversable
+from zope.app.traversing.namespace import etc
+from zope.app.traversing.namespace import provideNamespaceHandler
+from zope.app.traversing.adapters import WrapperPhysicallyLocatable
+from zope.app.traversing.adapters import Traverser, RootPhysicallyLocatable
 
 
 class PlacefulSetup(PlacelessSetup):


=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.3	Sat Dec 28 09:13:28 2002
+++ Zope3/src/zope/app/services/tests/test_objecthub.py	Sat Dec 28 12:49:32 2002
@@ -266,7 +266,6 @@
                           self.object_hub.register, u'/foo/\uffffstuff')
 
     def testIterObjectRegistrations(self):
-        from zope.app.traversing import locationAsUnicode
         def fake_object_for_location(location):
             return 'object at %s' % locationAsUnicode(location)