[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - iconfigurable.py:1.3 placefulsetup.py:1.21 servicemanager.py:1.4 test_adapter.py:1.13 test_cacheconfiguration.py:1.9 test_configurationregistry.py:1.5 test_configurations.py:1.5 test_configurationstatusproperty.py:1.5 test_connectionconfiguration.py:1.10 test_eventservice.py:1.21 test_nameconfigurable.py:1.3 test_servicemanager.py:1.9 test_utility.py:1.6 test_view.py:1.12
Jim Fulton
jim@zope.com
Tue, 27 May 2003 10:18:56 -0400
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv19792/src/zope/app/services/tests
Modified Files:
iconfigurable.py placefulsetup.py servicemanager.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_utility.py test_view.py
Log Message:
moved zope.proxy.context to zope.context
=== Zope3/src/zope/app/services/tests/iconfigurable.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/iconfigurable.py:1.2 Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/iconfigurable.py Tue May 27 10:18:25 2003
@@ -19,7 +19,7 @@
"""
from zope.app.interfaces.services.configuration import IConfigurable
from zope.interface.verify import verifyObject
-from zope.proxy.context import getWrapperContainer
+from zope.context import getWrapperContainer
class TestingIConfigurable:
"""Base class for testing implementors of IConfigurable
=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.20 Sun May 18 14:06:43 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py Tue May 27 10:18:25 2003
@@ -99,7 +99,7 @@
# | \ | |
# folder1_1_1 folder1_1_2 folder1_2_1 folder2_1_1
from zope.app.content.folder import Folder
- from zope.proxy.context import ContextWrapper
+ from zope.context import ContextWrapper
# top
self.createRootFolder()
# level 1
=== Zope3/src/zope/app/services/tests/servicemanager.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/servicemanager.py:1.3 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/servicemanager.py Tue May 27 10:18:25 2003
@@ -19,9 +19,9 @@
from zope.component.interfaces import IServiceService
from zope.app.component.nextservice import getNextServiceManager
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
from zope.app.interfaces.services.service import IBindingAware
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
class TestingServiceManager:
"""Simple placeful service manager used for writing tests
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.12 Wed May 21 16:30:05 2003
+++ Zope3/src/zope/app/services/tests/test_adapter.py Tue May 27 10:18:25 2003
@@ -20,7 +20,7 @@
from zope.app.services.tests.iconfigurable import TestingIConfigurable
from zope.app.services.adapter import AdapterService
from zope.interface import Interface, directlyProvides
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.services.tests.placefulsetup import PlacefulSetup
from zope.app.services.service import ServiceManager
=== Zope3/src/zope/app/services/tests/test_cacheconfiguration.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.8 Thu Apr 24 17:10:19 2003
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Tue May 27 10:18:25 2003
@@ -30,8 +30,8 @@
from zope.app.interfaces.services.configuration import IAttributeUseConfigurable
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.service import ServiceConfiguration
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextMethod
+from zope.context import ContextWrapper
from zope.app.interfaces.event import IObjectModifiedEvent
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.4 Sun Mar 23 17:35:42 2003
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Tue May 27 10:18:25 2003
@@ -20,7 +20,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
from zope.app.services.tests.placefulsetup import PlacefulSetup
-from zope.proxy.context import ContextWrapper, getItem
+from zope.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.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/test_configurations.py:1.4 Fri Mar 21 16:05:59 2003
+++ Zope3/src/zope/app/services/tests/test_configurations.py Tue May 27 10:18:25 2003
@@ -28,7 +28,7 @@
import PlacefulSetup
from zope.app.services.tests.servicemanager \
import TestingServiceManager
-from zope.proxy.context import ContextWrapper
+from zope.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.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py:1.4 Wed Apr 30 19:37:59 2003
+++ Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py Tue May 27 10:18:25 2003
@@ -27,7 +27,7 @@
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.interfaces.services.configuration \
import Active, Unregistered, Registered
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.interfaces.services.configuration import NoLocalServiceError
=== Zope3/src/zope/app/services/tests/test_connectionconfiguration.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.9 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py Tue May 27 10:18:25 2003
@@ -31,8 +31,8 @@
from zope.app.interfaces.services.configuration import IConfigurable
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.service import ServiceConfiguration
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextMethod
+from zope.context import ContextWrapper
from zope.app.interfaces.services.configuration \
import IAttributeUseConfigurable, IUseConfiguration
=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.20 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py Tue May 27 10:18:25 2003
@@ -35,7 +35,7 @@
from zope.app.interfaces.event import IEvent, ISubscribingAware
from zope.app.interfaces.services.configuration import Active
from zope.app.interfaces.services.configuration import Registered
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
from zope.app.services.tests.eventsetup import EventSetup
from zope.component.tests.components import RecordingAdapter
from zope.component.adapter import provideAdapter
=== Zope3/src/zope/app/services/tests/test_nameconfigurable.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/tests/test_nameconfigurable.py:1.2 Wed Dec 25 09:13:20 2002
+++ Zope3/src/zope/app/services/tests/test_nameconfigurable.py Tue May 27 10:18:25 2003
@@ -20,8 +20,8 @@
from zope.app.services.configuration import NameConfigurable
from zope.app.services.configuration import NameComponentConfigurable
-from zope.proxy.context import ContextWrapper
-from zope.proxy.context import getWrapperContainer
+from zope.context import ContextWrapper
+from zope.context import getWrapperContainer
class ConfigurationStub:
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.8 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Tue May 27 10:18:25 2003
@@ -19,7 +19,7 @@
from unittest import TestCase, TestLoader, TextTestRunner
from zope.interface import Interface
-from zope.proxy.context import getWrapperContainer
+from zope.context import getWrapperContainer
from zope.app.services.service import ServiceManager
from zope.app.services.service import ServiceConfiguration
from zope.component import getService, getServiceManager
@@ -171,7 +171,7 @@
self.assertEqual(service, ts)
def test_resolve(self):
- from zope.proxy.context import ContextWrapper as cw
+ from zope.context import ContextWrapper as cw
from zope.app.services.module import Manager
import zope.app.services.tests.sample1
import zope.app.services.tests.sample2
=== Zope3/src/zope/app/services/tests/test_utility.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_utility.py:1.5 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/test_utility.py Tue May 27 10:18:25 2003
@@ -32,7 +32,7 @@
from zope.app.interfaces.services.utility import ILocalUtility
from zope.app.interfaces.services.configuration import IUseConfiguration
from zope.app.interfaces.dependable import IDependable
-from zope.proxy.context import getWrapperContainer
+from zope.context import getWrapperContainer
class IFo(Interface): pass
=== Zope3/src/zope/app/services/tests/test_view.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.11 Thu May 1 15:35:35 2003
+++ Zope3/src/zope/app/services/tests/test_view.py Tue May 27 10:18:25 2003
@@ -20,7 +20,7 @@
from zope.app.services.tests.iconfigurable import TestingIConfigurable
from zope.app.services.view import ViewService
from zope.interface import Interface, directlyProvides
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.services.tests.placefulsetup import PlacefulSetup
from zope.app.services.service import ServiceManager