[Zope3-checkins] CVS: Zope3/src/zope/app/traversing/tests - test_conveniencefunctions.py:1.5.4.1 test_objectname.py:1.3.4.1 test_traverser.py:1.5.2.1

[Sidnei da Silva]

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

Modified Files:
      Tag: paris-copypasterename-branch
	test_conveniencefunctions.py test_objectname.py 
	test_traverser.py 
Log Message:
Updating from HEAD to make sure everything still works before merging

=== Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py 1.5 => 1.5.4.1 ===
--- Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py:1.5	Sat Dec 28 12:49:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_conveniencefunctions.py	Tue Feb 11 09:41:33 2003
@@ -20,6 +20,7 @@
 from zope.proxy.context import ContextWrapper
 from zope.app.traversing.adapters import Traverser
 from zope.component import getService
+from zope.component.servicenames import Adapters
 from zope.app.interfaces.traversing import ITraverser, ITraversable
 from zope.app.interfaces.traversing import IObjectName
 from zope.app.traversing.adapters import DefaultTraversable, ObjectName
@@ -65,15 +66,15 @@
         folder.item = item
 
         self.tr = Traverser(root)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, ITraverser, Traverser)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, ITraversable, DefaultTraversable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, IObjectName, ObjectName)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               IContainmentRoot, IPhysicallyLocatable, RootPhysicallyLocatable)
 
 


=== Zope3/src/zope/app/traversing/tests/test_objectname.py 1.3 => 1.3.4.1 ===
--- Zope3/src/zope/app/traversing/tests/test_objectname.py:1.3	Sat Dec 28 12:49:34 2002
+++ Zope3/src/zope/app/traversing/tests/test_objectname.py	Tue Feb 11 09:41:33 2003
@@ -21,6 +21,7 @@
 
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.component import getService, getAdapter
+from zope.component.servicenames import Adapters
 
 from zope.proxy.context import ContextWrapper
 from zope.app.interfaces.traversing import IObjectName
@@ -39,7 +40,7 @@
     def setUp(self):
         PlacelessSetup.setUp(self)
 
-        provideAdapter = getService(None, "Adapters").provideAdapter
+        provideAdapter = getService(None, Adapters).provideAdapter
         provideAdapter(None, IObjectName, [ObjectName])
         provideAdapter(IRoot, IObjectName, [ObjectName])
 


=== Zope3/src/zope/app/traversing/tests/test_traverser.py 1.5 => 1.5.2.1 ===
--- Zope3/src/zope/app/traversing/tests/test_traverser.py:1.5	Mon Dec 30 22:35:13 2002
+++ Zope3/src/zope/app/traversing/tests/test_traverser.py	Tue Feb 11 09:41:33 2003
@@ -28,6 +28,7 @@
 from zope.proxy.context import ContextWrapper
 from zope.exceptions import NotFoundError, Unauthorized
 from zope.component import getService
+from zope.component.servicenames import Adapters
 
 from zope.interface.verify import verifyClass
 from zope.interface.implements import instancesOfObjectImplements
@@ -78,11 +79,11 @@
         PlacefulSetup.setUp(self)
         # Build up a wrapper chain
 
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, ITraversable, DefaultTraversable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               IContainmentRoot, IPhysicallyLocatable, RootPhysicallyLocatable)
 
         self.root = root = C('root')
@@ -152,11 +153,11 @@
     def setUp(self):
         PlacefulSetup.setUp(self)
 
-        getService(None,"Adapters").provideAdapter(
+        getService(None,Adapters).provideAdapter(
              None, ITraversable, DefaultTraversable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               None, IPhysicallyLocatable, WrapperPhysicallyLocatable)
-        getService(None, "Adapters").provideAdapter(
+        getService(None, Adapters).provideAdapter(
               IContainmentRoot, IPhysicallyLocatable, RootPhysicallyLocatable)
 
         self.root = root = C('root')