[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/ Use correct import path now that the BBB stuff is gone

[Philipp von Weitershausen]

Log message for revision 65625:
  Use correct import path now that the BBB stuff is gone
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py
  U   Zope3/branches/jim-adapter/src/zope/app/component/tests/views.py
  U   Zope3/branches/jim-adapter/src/zope/app/form/tests/test_widget.py
  U   Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_requestpublicationfactories.py
  U   Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_simplecomponenttraverser.py
  U   Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/test_directives.py
  U   Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -22,7 +22,6 @@
 
 from zope.interface import Interface, implements
 from zope.testing.doctestunit import DocTestSuite
-from zope.component.tests.request import Request
 from zope.component import createObject
 from zope.component.interfaces import IDefaultViewName
 from zope.component.site import SubscriptionRegistration
@@ -47,7 +46,7 @@
 from zope.app.component.tests.adapter import I1, I2, I3, IS
 from zope.app.component.tests.components import IContent, Content, Comp, comp
 from zope.app.component.tests.components import IApp
-from zope.app.component.tests.views import IV, IC, V1, R1, IR
+from zope.app.component.tests.views import Request, IV, IC, V1, R1, IR
 from zope.app.content.interfaces import IContentType
 
 from zope.app.component.tests import module, exampleclass

Modified: Zope3/branches/jim-adapter/src/zope/app/component/tests/views.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/tests/views.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/component/tests/views.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -15,8 +15,13 @@
 
 $Id: views.py 26551 2004-07-15 07:06:37Z srichter $
 """
-from zope.interface import Interface, implements
+from zope.interface import Interface, implements, directlyProvides
 
+class Request(object):
+
+    def __init__(self, type):
+        directlyProvides(self, type)
+
 class IR(Interface):
     pass
 

Modified: Zope3/branches/jim-adapter/src/zope/app/form/tests/test_widget.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/tests/test_widget.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/form/tests/test_widget.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -100,11 +100,11 @@
     All widgets rely on a field and a request:
 
         >>> from zope.schema import Field
-        >>> from zope.component.tests.request import Request
         >>> field = Field()
         >>> from zope.interface import Interface
         >>> class ITestRequest(Interface):
         ...     pass
+        >>> from zope.app.component.tests.views import Request
         >>> widget = TestInputWidget(field, Request(ITestRequest))
 
     The default implementation of hasValidInput relies on

Modified: Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_requestpublicationfactories.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_requestpublicationfactories.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_requestpublicationfactories.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -23,7 +23,7 @@
 from zope.publisher.browser import BrowserRequest
 from zope.publisher.http import HTTPRequest
 from zope.publisher.xmlrpc import XMLRPCRequest
-from zope.component.tests.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
 
 from zope.app.publication.httpfactory import HTTPPublicationRequestFactory
 from zope.app.publication.browser import BrowserPublication

Modified: Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_simplecomponenttraverser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_simplecomponenttraverser.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_simplecomponenttraverser.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -16,9 +16,8 @@
 $Id$
 """
 import unittest
-from zope.component.tests.request import Request
 from zope.publisher.interfaces import NotFound
-from zope.interface import Interface
+from zope.interface import Interface, directlyProvides
 
 from zope.app.publication.traversers import SimpleComponentTraverser
 from zope.app.testing.placelesssetup import PlacelessSetup
@@ -37,7 +36,11 @@
         return getattr(self, name, default)
 
 
-class Request(Request):
+class Request(object):
+
+    def __init__(self, type):
+        directlyProvides(self, type)
+
     def getEffectiveURL(self):
         return ''
 

Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2006-02-28 23:45:59 UTC (rev 65625)
@@ -19,12 +19,9 @@
 
 from zope.configuration import xmlconfig
 from zope.configuration.exceptions import ConfigurationError
-from zope.app.component.tests.views import IC, V1
+from zope.app.component.tests.views import Request, IC, V1
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.security.proxy import ProxyFactory
-
-from zope.component.tests.request import Request
-
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
 
 from zope.app import zapi

Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml	2006-02-28 23:26:48 UTC (rev 65624)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml	2006-02-28 23:45:59 UTC (rev 65625)
@@ -6,8 +6,8 @@
 
   <xmlrpc:view
         name="test"
-        factory="zope.component.tests.views.V1"
-        for="zope.component.tests.views.IC"
+        factory="zope.app.component.tests.views.V1"
+        for="zope.app.component.tests.views.IC"
         methods="action index"
         permission="zope.Public" />