[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - placefulsetup.py:1.1.2.3 test_adapter.py:1.1.2.2 test_cacheconfiguration.py:1.1.2.3 test_configurationregistry.py:1.1.2.2 test_configurations.py:1.1.2.2 test_configurationstatusproperty.py:1.1.2.2 test_connectionconfiguration.py:1.1.2.3 test_eventservice.py:1.1.2.3 test_nameconfigurable.py:1.1.2.2 test_servicemanager.py:1.1.2.2 test_view.py:1.1.2.2 testingiconfigurable.py:1.1.2.2 testingservicemanager.py:1.1.2.2
Jim Fulton
jim@zope.com
Mon, 23 Dec 2002 18:53:07 -0500
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv2518/zope/app/services/tests
Modified Files:
Tag: NameGeddon-branch
placefulsetup.py test_adapter.py test_cacheconfiguration.py
test_configurationregistry.py test_configurations.py
test_configurationstatusproperty.py
test_connectionconfiguration.py test_eventservice.py
test_nameconfigurable.py test_servicemanager.py test_view.py
testingiconfigurable.py testingservicemanager.py
Log Message:
refactored context wrappers so we get them just from zope.proxy.context
=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.1.2.2 Mon Dec 23 18:22:20 2002
+++ Zope3/src/zope/app/services/tests/placefulsetup.py Mon Dec 23 18:52:36 2002
@@ -91,7 +91,7 @@
# folder1_1_1 folder1_1_2 folder1_2_1 folder2_1_1
from zope.app.content.folder import Folder
from zope.app.content.folder import RootFolder
- from zope.proxy.context.context import ContextWrapper
+ from zope.proxy.context import ContextWrapper
# top
self.rootFolder = RootFolder()
# level 1
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_adapter.py Mon Dec 23 18:52:36 2002
@@ -20,7 +20,7 @@
from zope.app.services.tests.testingiconfigurable import TestingIConfigurable
from zope.app.services.adapter import AdapterService
from zope.interface import Interface
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
=== Zope3/src/zope/app/services/tests/test_cacheconfiguration.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.1.2.2 Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Mon Dec 23 18:52:36 2002
@@ -37,7 +37,7 @@
from zope.app.services.service \
import ServiceConfiguration
from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.interfaces.event import IObjectModifiedEvent
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Mon Dec 23 18:52:36 2002
@@ -21,7 +21,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
-from zope.proxy.context.context import ContextWrapper, getItem
+from zope.proxy.context import ContextWrapper, getItem
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.service import ServiceManager
from Zope.App.Traversing import traverse
=== Zope3/src/zope/app/services/tests/test_configurations.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_configurations.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_configurations.py Mon Dec 23 18:52:36 2002
@@ -29,7 +29,7 @@
import PlacefulSetup
from zope.app.services.tests.testingservicemanager \
import TestingServiceManager
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.interfaces.dependable import IDependable
from Zope.App.Traversing import traverse
from zope.security.proxy import Proxy
=== Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py Mon Dec 23 18:52:36 2002
@@ -28,7 +28,7 @@
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.interfaces.services.configuration \
import Active, Unregistered, Registered
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
=== Zope3/src/zope/app/services/tests/test_connectionconfiguration.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.1.2.2 Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py Mon Dec 23 18:52:36 2002
@@ -39,7 +39,7 @@
from zope.app.services.service \
import ServiceConfiguration
from zope.proxy.context import ContextMethod
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
class DependableStub:
=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.1.2.2 Mon Dec 23 18:16:31 2002
+++ Zope3/src/zope/app/services/tests/test_eventservice.py Mon Dec 23 18:52:36 2002
@@ -45,7 +45,7 @@
from zope.app.interfaces.services.configuration import Unregistered
from zope.app.interfaces.services.configuration import Registered
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.services.tests.eventsetup import EventSetup
=== Zope3/src/zope/app/services/tests/test_nameconfigurable.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_nameconfigurable.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_nameconfigurable.py Mon Dec 23 18:52:36 2002
@@ -20,8 +20,8 @@
from zope.app.services.configuration import NameConfigurable
from zope.app.services.configuration import NameComponentConfigurable
-from zope.proxy.context.context import ContextWrapper
-from zope.proxy.context.context import getWrapperContainer
+from zope.proxy.context import ContextWrapper
+from zope.proxy.context import getWrapperContainer
class ConfigurationStub:
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Mon Dec 23 18:52:36 2002
@@ -21,7 +21,7 @@
from zope.interface import Interface
from zope.app.content.folder import RootFolder
from zope.app.content.folder import Folder
-from zope.proxy.context.context import getWrapperContext, getWrapperContainer
+from zope.proxy.context import getWrapperContext, getWrapperContainer
from zope.app.services.service import ServiceManager
from zope.app.services.service \
import ServiceConfiguration
@@ -160,7 +160,7 @@
self.assertEqual(service, ts)
def test_resolve(self):
- from zope.proxy.context.context import ContextWrapper as cw
+ from zope.proxy.context import ContextWrapper as cw
from zope.app.services.module import Manager
import Zope.App.OFS.Services.ServiceManager.tests.Sample1
import Zope.App.OFS.Services.ServiceManager.tests.Sample2
=== Zope3/src/zope/app/services/tests/test_view.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_view.py Mon Dec 23 18:52:36 2002
@@ -20,7 +20,7 @@
from zope.app.services.tests.testingiconfigurable import TestingIConfigurable
from zope.app.services.view import ViewService
from zope.interface import Interface
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
=== Zope3/src/zope/app/services/tests/testingiconfigurable.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/testingiconfigurable.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/testingiconfigurable.py Mon Dec 23 18:52:36 2002
@@ -19,7 +19,7 @@
"""
from zope.app.interfaces.services.configuration import IConfigurable
from zope.interface.verify import verifyObject
-from zope.proxy.context.context import getWrapperContainer
+from zope.proxy.context import getWrapperContainer
class TestingIConfigurable:
"""Base class for testing implementors of IConfigurable
=== Zope3/src/zope/app/services/tests/testingservicemanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/testingservicemanager.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/testingservicemanager.py Mon Dec 23 18:52:36 2002
@@ -20,7 +20,7 @@
from zope.component.interfaces import IServiceService
from zope.app.component.nextservice \
import getNextService, getNextServiceManager
-from zope.proxy.context.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.interfaces.services.service import IBindingAware
from zope.proxy.context import ContextMethod