[Zope3-checkins] CVS: Zope3/src/zope/publisher/tests - test_browserrequest.py:1.8.12.2 test_http.py:1.20.10.2 test_xmlrpcrequest.py:1.5.44.2

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/publisher/tests
In directory cvs.zope.org:/tmp/cvs-serv19243/src/zope/publisher/tests

Modified Files:
      Tag: adaptergeddon-branch
	test_browserrequest.py test_http.py test_xmlrpcrequest.py 
Log Message:
Implemented local presentation services.


=== Zope3/src/zope/publisher/tests/test_browserrequest.py 1.8.12.1 => 1.8.12.2 ===
--- Zope3/src/zope/publisher/tests/test_browserrequest.py:1.8.12.1	Sun Nov  9 11:08:35 2003
+++ Zope3/src/zope/publisher/tests/test_browserrequest.py	Tue Nov 18 17:26:42 2003
@@ -14,7 +14,7 @@
 import unittest
 
 from zope.component.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 
@@ -61,7 +61,8 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
 
         class AppRoot:
             " "


=== Zope3/src/zope/publisher/tests/test_http.py 1.20.10.1 => 1.20.10.2 ===
--- Zope3/src/zope/publisher/tests/test_http.py:1.20.10.1	Sun Nov  9 11:08:35 2003
+++ Zope3/src/zope/publisher/tests/test_http.py	Tue Nov 18 17:26:42 2003
@@ -16,7 +16,7 @@
 from zope.app.services.tests.placefulsetup import PlacefulSetup
 from zope.app.interfaces.security import IPrincipal
 from zope.interface import implements
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 from zope.publisher.interfaces.logginginfo import ILoggingInfo
 from zope.publisher.http import HTTPRequest
 from zope.publisher.publish import publish
@@ -226,7 +226,7 @@
             auth_user_name = None
             def setAuthUserName(self, name):
                 self.auth_user_name = name
-        provideAdapter(IPrincipal, ILoggingInfo, PrincipalLoggingStub)
+        ztapi.provideAdapter(IPrincipal, ILoggingInfo, PrincipalLoggingStub)
         task = HTTPTaskStub()
         req = self._createRequest(outstream=task)
         req.setUser(UserStub("jim"))


=== Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py 1.5.44.1 => 1.5.44.2 ===
--- Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py:1.5.44.1	Sun Nov  9 11:08:35 2003
+++ Zope3/src/zope/publisher/tests/test_xmlrpcrequest.py	Tue Nov 18 17:26:42 2003
@@ -14,7 +14,7 @@
 import unittest
 
 from zope.component.tests.placelesssetup import PlacelessSetup
-from zope.component.adapter import provideAdapter
+from zope.app.tests import ztapi
 
 from zope.i18n.interfaces import IUserPreferredCharsets
 
@@ -69,7 +69,8 @@
 
     def setUp(self):
         PlacelessSetup.setUp(self)
-        provideAdapter(IHTTPRequest, IUserPreferredCharsets, HTTPCharsets)
+        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
+                             HTTPCharsets)
         class AppRoot:
             " "