[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - placefulsetup.py:1.22 servicemanager.py:1.5 test_adapter.py:1.14 test_cacheconfiguration.py:1.10 test_configurationregistry.py:1.6 test_configurations.py:1.6 test_configurationstatusproperty.py:1.6 test_connectionconfiguration.py:1.11 test_eventservice.py:1.22 test_nameconfigurable.py:1.4 test_servicemanager.py:1.10 test_view.py:1.14
Jim Fulton
jim@zope.com
Sun, 1 Jun 2003 12:00:07 -0400
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv25908/src/zope/app/services/tests
Modified Files:
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_view.py
Log Message:
Moved ContextWrapper, getItem, getAttr, queryItem, and queryAttr
from zope.context to zope.app.context.
=== Zope3/src/zope/app/services/tests/placefulsetup.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/tests/placefulsetup.py:1.21 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/placefulsetup.py Sun Jun 1 11:59:36 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.context import ContextWrapper
+ from zope.app.context import ContextWrapper
# top
self.createRootFolder()
# level 1
=== Zope3/src/zope/app/services/tests/servicemanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/tests/servicemanager.py:1.4 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/servicemanager.py Sun Jun 1 11:59:36 2003
@@ -19,7 +19,7 @@
from zope.component.interfaces import IServiceService
from zope.app.component.nextservice import getNextServiceManager
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
from zope.app.interfaces.services.service import IBindingAware
from zope.context import ContextMethod
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.13 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_adapter.py Sun Jun 1 11:59:36 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.context import ContextWrapper
+from zope.app.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.9 => 1.10 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.9 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Sun Jun 1 11:59:36 2003
@@ -31,7 +31,7 @@
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.service import ServiceConfiguration
from zope.context import ContextMethod
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
from zope.app.interfaces.event import IObjectModifiedEvent
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.5 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Sun Jun 1 11:59:36 2003
@@ -20,7 +20,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
from zope.app.services.tests.placefulsetup import PlacefulSetup
-from zope.context import ContextWrapper, getItem
+from zope.app.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.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_configurations.py:1.5 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_configurations.py Sun Jun 1 11:59:36 2003
@@ -28,7 +28,7 @@
import PlacefulSetup
from zope.app.services.tests.servicemanager \
import TestingServiceManager
-from zope.context import ContextWrapper
+from zope.app.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.5 => 1.6 ===
--- Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py:1.5 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_configurationstatusproperty.py Sun Jun 1 11:59:36 2003
@@ -27,7 +27,7 @@
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.interfaces.services.configuration \
import Active, Unregistered, Registered
-from zope.context import ContextWrapper
+from zope.app.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.10 => 1.11 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.10 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py Sun Jun 1 11:59:36 2003
@@ -32,7 +32,7 @@
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.service import ServiceConfiguration
from zope.context import ContextMethod
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
from zope.app.interfaces.services.configuration \
import IAttributeUseConfigurable, IUseConfiguration
=== Zope3/src/zope/app/services/tests/test_eventservice.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/tests/test_eventservice.py:1.21 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_eventservice.py Sun Jun 1 11:59:36 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.context import ContextWrapper
+from zope.app.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.3 => 1.4 ===
--- Zope3/src/zope/app/services/tests/test_nameconfigurable.py:1.3 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_nameconfigurable.py Sun Jun 1 11:59:36 2003
@@ -20,7 +20,7 @@
from zope.app.services.configuration import NameConfigurable
from zope.app.services.configuration import NameComponentConfigurable
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
from zope.context import getWrapperContainer
class ConfigurationStub:
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.9 Tue May 27 10:18:25 2003
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Sun Jun 1 11:59:36 2003
@@ -171,7 +171,7 @@
self.assertEqual(service, ts)
def test_resolve(self):
- from zope.context import ContextWrapper as cw
+ from zope.app.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_view.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.13 Wed May 28 11:46:11 2003
+++ Zope3/src/zope/app/services/tests/test_view.py Sun Jun 1 11:59:36 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.context import ContextWrapper
+from zope.app.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
from zope.app.services.tests.placefulsetup import PlacefulSetup
from zope.app.services.service import ServiceManager