[Zope3-checkins] CVS: Zope3/src/zope/app/traversing/tests - test_acquire.py:1.4 test_atteritem.py:1.3 test_conveniencefunctions.py:1.5 test_etc.py:1.3 test_namespacetrversal.py:1.3 test_objectname.py:1.3 test_physicallocationadapters.py:1.4 test_presentation.py:1.3 test_skin.py:1.3 test_traverser.py:1.4

Steve Alexander steve@cat-box.net
Sat, 28 Dec 2002 12:49:35 -0500


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

Modified Files:
	test_acquire.py test_atteritem.py test_conveniencefunctions.py 
	test_etc.py test_namespacetrversal.py test_objectname.py 
	test_physicallocationadapters.py test_presentation.py 
	test_skin.py test_traverser.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/traversing/tests/test_acquire.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/traversing/tests/test_acquire.py:1.3	Sat Dec 28 09:13:29 2002
+++ Zope3/src/zope/app/traversing/tests/test_acquire.py	Sat Dec 28 12:49:34 2002
@@ -20,10 +20,10 @@
 from unittest import TestCase, TestSuite, main, makeSuite
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.app.interfaces.traversing import ITraversable
-from zope.app.traversing.defaulttraversable import DefaultTraversable
+from zope.app.traversing.adapters import DefaultTraversable
 from zope.component.adapter import provideAdapter
 from zope.proxy.context import ContextWrapper, getWrapperContext
-from zope.app.traversing.acquirenamespace import acquire
+from zope.app.traversing.namespace import acquire
 from zope.exceptions import NotFoundError
 
 class Test(PlacelessSetup, TestCase):


=== Zope3/src/zope/app/traversing/tests/test_atteritem.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_atteritem.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_atteritem.py	Sat Dec 28 12:49:34 2002
@@ -30,11 +30,11 @@
 class Test(CleanUp, TestCase):
 
     def testAttr(self):
-        from zope.app.traversing.attritemnamespaces import attr
+        from zope.app.traversing.namespace import attr
         self.assertEqual(attr('a', (), 'a;attribute', c, None), 1)
 
     def testItem(self):
-        from zope.app.traversing.attritemnamespaces import item
+        from zope.app.traversing.namespace import item
         self.assertEqual(item('a', (), 'a;item', c, None), 'avalue')
 
 


=== Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py:1.4	Sat Dec 28 10:20:50 2002
+++ Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py	Sat Dec 28 12:49:34 2002
@@ -18,17 +18,16 @@
 from unittest import TestCase, main, makeSuite
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.proxy.context import ContextWrapper
-from zope.app.traversing.traverser import Traverser
+from zope.app.traversing.adapters import Traverser
 from zope.component import getService
 from zope.app.interfaces.traversing import ITraverser, ITraversable
 from zope.app.interfaces.traversing import IObjectName
-from zope.app.traversing.defaulttraversable import DefaultTraversable
-from zope.app.traversing.objectname import ObjectName
+from zope.app.traversing.adapters import DefaultTraversable, ObjectName
 
 from zope.app.interfaces.traversing import IPhysicallyLocatable
 from zope.app.interfaces.traversing import IContainmentRoot
-from zope.app.traversing.physicallocationadapters \
-     import WrapperPhysicallyLocatable, RootPhysicallyLocatable
+from zope.app.traversing.adapters import WrapperPhysicallyLocatable
+from zope.app.traversing.adapters import RootPhysicallyLocatable
 
 from zope.security.proxy import Proxy
 from zope.security.checker import selectChecker


=== Zope3/src/zope/app/traversing/tests/test_etc.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_etc.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_etc.py	Sat Dec 28 12:49:34 2002
@@ -23,7 +23,7 @@
 class Test(CleanUp, TestCase):
 
     def testApplicationControl(self):
-        from zope.app.traversing.etcnamespace import etc
+        from zope.app.traversing.namespace import etc
         from zope.app.applicationcontrol.applicationcontrol \
              import applicationController, applicationControllerRoot
 
@@ -33,7 +33,7 @@
             applicationController)
 
     def testServices(self):
-        from zope.app.traversing.etcnamespace import etc
+        from zope.app.traversing.namespace import etc
         class C:
             def getServiceManager(self): return 42
 


=== Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_namespacetrversal.py	Sat Dec 28 12:49:34 2002
@@ -30,21 +30,21 @@
 class Test(CleanUp, TestCase):
 
     def setUp(self):
-        from zope.app.traversing.namespaces import provideNamespaceHandler
-        from zope.app.traversing.attritemnamespaces import attr, item
-        from zope.app.traversing.skinnamespace import skin
+        from zope.app.traversing.namespace import provideNamespaceHandler
+        from zope.app.traversing.namespace import attr, item
+        from zope.app.traversing.namespace import skin
         provideNamespaceHandler('attribute', attr)
         provideNamespaceHandler('item', item)
         provideNamespaceHandler('skin', skin)
 
     def testAttr(self):
-        from zope.app.traversing.traverser import Traverser
+        from zope.app.traversing.adapters import Traverser
         traverser = Traverser(c)
         v = traverser.traverse('++attribute++a')
         self.assertEqual(v, 1)
 
     def testItem(self):
-        from zope.app.traversing.traverser import Traverser
+        from zope.app.traversing.adapters import Traverser
         traverser = Traverser(c)
         v = traverser.traverse('++item++a')
         self.assertEqual(v, 'avalue')
@@ -52,9 +52,8 @@
     def testSideEffectsContextDetail(self):
         # Check to make sure that when we traverse something in context,
         # that we get the right context for the result.
-        from zope.proxy.context \
-             import ContextWrapper, getWrapperContainer
-        from zope.app.traversing.traverser import Traverser
+        from zope.proxy.context import ContextWrapper, getWrapperContainer
+        from zope.app.traversing.adapters import Traverser
         from zope.publisher.browser import TestRequest
 
         c1 = C()


=== Zope3/src/zope/app/traversing/tests/test_objectname.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_objectname.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_objectname.py	Sat Dec 28 12:49:34 2002
@@ -23,9 +23,8 @@
 from zope.component import getService, getAdapter
 
 from zope.proxy.context import ContextWrapper
-
-from zope.app.traversing.objectname \
-    import IObjectName, ObjectName, SiteObjectName
+from zope.app.interfaces.traversing import IObjectName
+from zope.app.traversing.adapters import ObjectName, SiteObjectName
 
 class IRoot(Interface): pass
 


=== Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py:1.3	Sat Dec 28 09:13:29 2002
+++ Zope3/src/zope/app/traversing/tests/test_physicallocationadapters.py	Sat Dec 28 12:49:34 2002
@@ -22,8 +22,8 @@
 
 from zope.app.interfaces.traversing import IContainmentRoot
 from zope.app.interfaces.traversing import IPhysicallyLocatable
-from zope.app.traversing.physicallocationadapters \
-     import WrapperPhysicallyLocatable, RootPhysicallyLocatable
+from zope.app.traversing.adapters import WrapperPhysicallyLocatable
+from zope.app.traversing.adapters import RootPhysicallyLocatable
 from zope.proxy.context import ContextWrapper
 
 class Root: __implements__ = IContainmentRoot


=== Zope3/src/zope/app/traversing/tests/test_presentation.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_presentation.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_presentation.py	Sat Dec 28 12:49:34 2002
@@ -21,7 +21,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component.view import provideView
 from zope.component.resource import provideResource
-from zope.app.traversing.presentationnamespaces import view, resource
+from zope.app.traversing.namespace import view, resource
 from zope.exceptions import NotFoundError
 from zope.interface import Interface
 


=== Zope3/src/zope/app/traversing/tests/test_skin.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/traversing/tests/test_skin.py:1.2	Wed Dec 25 09:13:27 2002
+++ Zope3/src/zope/app/traversing/tests/test_skin.py	Sat Dec 28 12:49:34 2002
@@ -24,7 +24,7 @@
 class Test(CleanUp, TestCase):
 
     def test(self):
-        from zope.app.traversing.skinnamespace import skin
+        from zope.app.traversing.namespace import skin
 
         request = TestRequest()
         self.assertEqual(request.getPresentationSkin(), '')


=== Zope3/src/zope/app/traversing/tests/test_traverser.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/traversing/tests/test_traverser.py:1.3	Sat Dec 28 09:13:29 2002
+++ Zope3/src/zope/app/traversing/tests/test_traverser.py	Sat Dec 28 12:49:34 2002
@@ -18,13 +18,12 @@
 
 import unittest
 from zope.app.interfaces.traversing import ITraverser, ITraversable
-from zope.app.traversing.traverser import Traverser
-from zope.app.traversing.defaulttraversable import DefaultTraversable
+from zope.app.traversing.adapters import Traverser, DefaultTraversable
 
 from zope.app.interfaces.traversing import IPhysicallyLocatable
 from zope.app.interfaces.traversing import IContainmentRoot
-from zope.app.traversing.physicallocationadapters \
-     import WrapperPhysicallyLocatable, RootPhysicallyLocatable
+from zope.app.traversing.adapters import WrapperPhysicallyLocatable
+from zope.app.traversing.adapters import RootPhysicallyLocatable
 
 from zope.proxy.context import ContextWrapper
 from zope.exceptions import NotFoundError, Unauthorized