[Zope3-checkins] CVS: Zope3/src/zope/app/services/tests - eventsetup.py:1.1.2.2 objecthubsetup.py:1.1.2.2 test_adapter.py:1.1.2.3 test_cacheconfiguration.py:1.1.2.4 test_cachingservice.py:1.1.2.2 test_configurationregistry.py:1.1.2.3 test_configurations.py:1.1.2.3 test_connectionconfiguration.py:1.1.2.4 test_connectionservice.py:1.1.2.3 test_field.py:1.1.2.2 test_hookedhubevent.py:1.1.2.2 test_objecthub.py:1.1.2.2 test_serviceconfiguration.py:1.1.2.3 test_servicemanager.py:1.1.2.3 test_view.py:1.1.2.3 test_viewpackage.py:1.1.2.2 testingservicemanager.py:1.1.2.3
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:49 -0500
Update of /cvs-repository/Zope3/src/zope/app/services/tests
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/services/tests
Modified Files:
Tag: NameGeddon-branch
eventsetup.py objecthubsetup.py test_adapter.py
test_cacheconfiguration.py test_cachingservice.py
test_configurationregistry.py test_configurations.py
test_connectionconfiguration.py test_connectionservice.py
test_field.py test_hookedhubevent.py test_objecthub.py
test_serviceconfiguration.py test_servicemanager.py
test_view.py test_viewpackage.py testingservicemanager.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/app/services/tests/eventsetup.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/eventsetup.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/eventsetup.py Tue Dec 24 07:51:18 2002
@@ -29,7 +29,7 @@
from zope.app.services.service \
import ServiceConfiguration
-from Zope.App.Traversing import getPhysicalPathString, traverse
+from zope.app.traversing import getPhysicalPathString, traverse
from zope.app.interfaces.services.configuration import Active
=== Zope3/src/zope/app/services/tests/objecthubsetup.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/objecthubsetup.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/objecthubsetup.py Tue Dec 24 07:51:18 2002
@@ -17,12 +17,10 @@
$Id$
"""
-from zope.app.services.tests.eventsetup import \
- EventSetup
+from zope.app.services.tests.eventsetup import EventSetup
from zope.component import getServiceManager
-from zope.app.services.service \
- import ServiceConfiguration
-from Zope.App.Traversing import getPhysicalPathString, traverse
+from zope.app.services.service import ServiceConfiguration
+from zope.app.traversing import getPhysicalPathString, traverse
from zope.app.services.hub import ObjectHub
from zope.app.interfaces.services.configuration import Active
=== Zope3/src/zope/app/services/tests/test_adapter.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_adapter.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_adapter.py Tue Dec 24 07:51:18 2002
@@ -22,13 +22,12 @@
from zope.interface import Interface
from zope.proxy.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
+from zope.app.services.tests.placefulsetup import PlacefulSetup
from zope.app.services.service import ServiceManager
from zope.app.services.adapter import AdapterConfiguration
from zope.app.content.folder import RootFolder
from zope.component import getServiceManager
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.component.interfaces import IServiceService
from zope.component.adapter import provideAdapter
=== Zope3/src/zope/app/services/tests/test_cacheconfiguration.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/tests/test_cacheconfiguration.py:1.1.2.3 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_cacheconfiguration.py Tue Dec 24 07:51:18 2002
@@ -17,25 +17,18 @@
"""
from unittest import TestCase, main, makeSuite
-
-from zope.app.services.cache \
- import CacheConfiguration
-
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
-from Zope.App.Traversing import traverse
-from zope.app.services.service \
- import ServiceManager
+from zope.app.services.cache import CacheConfiguration
+from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.traversing import traverse
+from zope.app.services.service import ServiceManager
from zope.app.container.zopecontainer import ZopeContainerAdapter
-from zope.app.interfaces.services.configuration \
- import Active, Unregistered
+from zope.app.interfaces.services.configuration import Active, Unregistered
from zope.app.interfaces.cache.cache import ICache
from zope.app.interfaces.dependable import IDependable
from zope.app.interfaces.cache.cache import ICachingService
from zope.app.interfaces.services.configuration import IConfigurable
from zope.app.services.configuration import ConfigurationRegistry
-from zope.app.services.service \
- import ServiceConfiguration
+from zope.app.services.service import ServiceConfiguration
from zope.proxy.context import ContextMethod
from zope.proxy.context import ContextWrapper
from zope.app.interfaces.event import IObjectModifiedEvent
=== Zope3/src/zope/app/services/tests/test_cachingservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_cachingservice.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_cachingservice.py Tue Dec 24 07:51:18 2002
@@ -20,13 +20,11 @@
from zope.interface.verify import verifyObject
from zope.app.interfaces.cache.cache import ICache
from zope.app.interfaces.cache.cache import ICachingService
-from zope.app.services.cache \
- import CacheConfiguration
+from zope.app.services.cache import CacheConfiguration
from zope.app.interfaces.services.configuration import Active, Registered
from zope.app.services.tests.eventsetup import EventSetup
-from zope.app.services.service \
- import ServiceConfiguration
-from Zope.App.Traversing import getPhysicalPathString, traverse
+from zope.app.services.service import ServiceConfiguration
+from zope.app.traversing import getPhysicalPathString, traverse
def sort(list):
=== Zope3/src/zope/app/services/tests/test_configurationregistry.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_configurationregistry.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_configurationregistry.py Tue Dec 24 07:51:18 2002
@@ -19,12 +19,11 @@
"""
from unittest import TestCase, TestSuite, main, makeSuite
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
+from zope.app.services.tests.placefulsetup import PlacefulSetup
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
+from zope.app.traversing import traverse
class Configuration:
=== Zope3/src/zope/app/services/tests/test_configurations.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_configurations.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_configurations.py Tue Dec 24 07:51:18 2002
@@ -11,8 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Unit tests for configuration classes defined in
-Zope.App.OFS.Services.Configuration
+"""Unit tests for configuration classes
$Id$
"""
@@ -31,7 +30,7 @@
import TestingServiceManager
from zope.proxy.context import ContextWrapper
from zope.app.interfaces.dependable import IDependable
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.security.proxy import Proxy
@@ -103,7 +102,7 @@
path, component = 'foo', object()
self.rootFolder.setObject(path, component)
# set up a configuration
- cfg = NamedComponentConfiguration(self.name, path, 'Zope.TopSecret')
+ cfg = NamedComponentConfiguration(self.name, path, 'zope.TopSecret')
cfg.getInterface = lambda: ITestComponent
cfg = ContextWrapper(cfg, self.rootFolder)
# check that getComponent finds the configuration
=== Zope3/src/zope/app/services/tests/test_connectionconfiguration.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/tests/test_connectionconfiguration.py:1.1.2.3 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_connectionconfiguration.py Tue Dec 24 07:51:18 2002
@@ -20,24 +20,20 @@
from zope.interface import Interface
-from zope.app.services.connection \
- import ConnectionConfiguration
+from zope.app.services.connection import ConnectionConfiguration
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
-from Zope.App.Traversing import traverse
-from zope.app.services.service \
- import ServiceManager
+from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.traversing import traverse
+from zope.app.services.service import ServiceManager
from zope.app.container.zopecontainer import ZopeContainerAdapter
-from zope.app.interfaces.services.configuration \
- import Active, Unregistered, Registered
+from zope.app.interfaces.services.configuration import Active, Unregistered
+from zope.app.interfaces.services.configuration import Registered
from zope.app.interfaces.rdb import IZopeDatabaseAdapter
from zope.app.interfaces.dependable import IDependable
from zope.app.interfaces.rdb import IConnectionService
from zope.app.interfaces.services.configuration import IConfigurable
from zope.app.services.configuration import ConfigurationRegistry
-from zope.app.services.service \
- import ServiceConfiguration
+from zope.app.services.service import ServiceConfiguration
from zope.proxy.context import ContextMethod
from zope.proxy.context import ContextWrapper
=== Zope3/src/zope/app/services/tests/test_connectionservice.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_connectionservice.py:1.1.2.2 Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/tests/test_connectionservice.py Tue Dec 24 07:51:18 2002
@@ -16,7 +16,7 @@
"""
import unittest
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.app.interfaces.rdb import IZopeConnection
from zope.app.interfaces.rdb import IZopeDatabaseAdapter
from zope.app.interfaces.rdb import \
=== Zope3/src/zope/app/services/tests/test_field.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_field.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_field.py Tue Dec 24 07:51:18 2002
@@ -17,9 +17,8 @@
"""
from unittest import TestCase, TestSuite, main, makeSuite
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
-from Zope.App.Traversing import traverse
+from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.traversing import traverse
from zope.schema.interfaces import ValidationError
from zope.interface import Interface
from zope.app.services.field import ComponentLocation
=== Zope3/src/zope/app/services/tests/test_hookedhubevent.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_hookedhubevent.py:1.1.2.1 Mon Dec 23 14:32:23 2002
+++ Zope3/src/zope/app/services/tests/test_hookedhubevent.py Tue Dec 24 07:51:18 2002
@@ -27,7 +27,7 @@
ObjectRegisteredHubEvent, ObjectUnregisteredHubEvent, \
ObjectModifiedHubEvent, ObjectMovedHubEvent, \
ObjectRemovedHubEvent
-from Zope.App.Traversing import getPhysicalPath
+from zope.app.traversing import getPhysicalPath
from zope.component import getService
=== Zope3/src/zope/app/services/tests/test_objecthub.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_objecthub.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_objecthub.py Tue Dec 24 07:51:18 2002
@@ -38,7 +38,7 @@
from zope.exceptions import NotFoundError
from types import StringTypes
-from Zope.App.Traversing import locationAsUnicode, locationAsTuple
+from zope.app.traversing import locationAsUnicode, locationAsTuple
from zope.component import getService, getServiceManager
@@ -49,8 +49,9 @@
# test happens simply by virtue of the testHubEvent module in this
# directory
-class LoggingSubscriber: # XXX Jim mentioned there is a new generic
- # version of this in Zope.App somewhere...
+class LoggingSubscriber:
+ # XXX Jim mentioned there is a new generic
+ # version of this in zope.app somewhere...
__implements__ = ISubscriber
@@ -261,7 +262,7 @@
self.object_hub.register, u'/foo/\uffffstuff')
def testIterObjectRegistrations(self):
- from Zope.App.Traversing import locationAsUnicode
+ from zope.app.traversing import locationAsUnicode
def fake_object_for_location(location):
return 'object at %s' % locationAsUnicode(location)
=== Zope3/src/zope/app/services/tests/test_serviceconfiguration.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_serviceconfiguration.py:1.1.2.2 Mon Dec 23 17:49:33 2002
+++ Zope3/src/zope/app/services/tests/test_serviceconfiguration.py Tue Dec 24 07:51:18 2002
@@ -23,19 +23,14 @@
from zope.interface import Interface
from zope.component import getServiceManager
-from Zope.App.Traversing import traverse
-from zope.app.services.service \
- import ServiceConfiguration
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
-from zope.app.services.service \
- import ServiceManager
-from zope.component.service \
- import serviceManager
-from zope.app.interfaces.services.service \
- import IBindingAware
-from zope.app.interfaces.services.configuration \
- import Active, Unregistered, Registered
+from zope.app.traversing import traverse
+from zope.app.services.service import ServiceConfiguration
+from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.services.service import ServiceManager
+from zope.component.service import serviceManager
+from zope.app.interfaces.services.service import IBindingAware
+from zope.app.interfaces.services.configuration import Active, Unregistered
+from zope.app.interfaces.services.configuration import Registered
from zope.app.interfaces.dependable import IDependable
from zope.app.interfaces.dependable import DependencyError
@@ -112,7 +107,7 @@
self.assertEquals(self.__config.getInterface(), ITestService)
# XXX the following tests check the same things as
- # Zope.App.OFS.Services.tests.testConfigurations, but in a different way
+ # zope.app.services.tests.testconfigurations, but in a different way
def test_getComponent(self):
self.assertEqual(self.__config.getComponent(), self.__c)
=== Zope3/src/zope/app/services/tests/test_servicemanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_servicemanager.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_servicemanager.py Tue Dec 24 07:51:18 2002
@@ -23,16 +23,14 @@
from zope.app.content.folder import Folder
from zope.proxy.context import getWrapperContext, getWrapperContainer
from zope.app.services.service import ServiceManager
-from zope.app.services.service \
- import ServiceConfiguration
+from zope.app.services.service import ServiceConfiguration
from zope.component import getService, getServiceManager
from zope.exceptions import ZopeError
from zope.app.services.tests.placefulsetup import PlacefulSetup
-from Zope.App.Traversing import traverse
-from zope.app.interfaces.services.configuration \
- import Active, Unregistered, Registered
-from zope.component.service \
- import serviceManager
+from zope.app.traversing import traverse
+from zope.app.interfaces.services.configuration import Active, Unregistered
+from zope.app.interfaces.services.configuration import Registered
+from zope.component.service import serviceManager
class ITestService(Interface):
pass
@@ -162,8 +160,8 @@
def test_resolve(self):
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
+ import zope.app.services.tests.sample1
+ import zope.app.services.tests.sample2
self.rootFolder.setServiceManager(ServiceManager())
sm=getServiceManager(self.rootFolder)
@@ -171,7 +169,7 @@
default = cw(Packages['default'], Packages, name='Packages')
default.setObject('m1', Manager())
manager = cw(default['m1'], default, name='m1')
- manager.new('Zope.App.OFS.Services.ServiceManager.tests.Sample1',
+ manager.new('zope.app.ofs.services.tests.sample1',
'x = "root m1"\n')
default.setObject('m2', Manager())
manager = cw(default['m2'], default, name='m1')
@@ -183,21 +181,21 @@
default = cw(Packages['default'], Packages, name='Packages')
default.setObject('m1', Manager())
manager = cw(default['m1'], default, name='m1')
- manager.new('Zope.App.OFS.Services.ServiceManager.tests.Sample1',
+ manager.new('zope.app.services.tests.sample1',
'x = "folder1 m1 1"')
self.assertEqual(
- sm2.resolve("Zope.App.OFS.Services.ServiceManager.tests.Sample1.x"),
+ sm2.resolve("zope.app.services.tests.sample1.x"),
"folder1 m1 1")
self.assertEqual(
- sm.resolve("Zope.App.OFS.Services.ServiceManager.tests.Sample1.x"),
+ sm.resolve("zope.app.services.tests.sample1.x"),
"root m1")
self.assertEqual(
- sm2.resolve("Zope.App.OFS.Services.ServiceManager.tests.Sample2.y"),
+ sm2.resolve("zope.app.services.tests.sample2.y"),
"sample 2")
self.assertEqual(
- sm.resolve("Zope.App.OFS.Services.ServiceManager.tests.Sample2.y"),
+ sm.resolve("zope.app.services.tests.sample2.y"),
"sample 2")
self.assertEqual(sm.resolve("XXX.ZZZ.ZZZ"), 42)
=== Zope3/src/zope/app/services/tests/test_view.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/test_view.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/test_view.py Tue Dec 24 07:51:18 2002
@@ -22,13 +22,12 @@
from zope.interface import Interface
from zope.proxy.context import ContextWrapper
from zope.component.exceptions import ComponentLookupError
-from zope.app.services.tests.placefulsetup \
- import PlacefulSetup
+from zope.app.services.tests.placefulsetup import PlacefulSetup
from zope.app.services.service import ServiceManager
from zope.app.services.view import ViewConfiguration
from zope.app.content.folder import RootFolder
from zope.component import getServiceManager
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.component.interfaces import IServiceService
from zope.component.view import provideView
from zope.publisher.browser import TestRequest
=== Zope3/src/zope/app/services/tests/test_viewpackage.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/tests/test_viewpackage.py:1.1.2.1 Mon Dec 23 14:32:24 2002
+++ Zope3/src/zope/app/services/tests/test_viewpackage.py Tue Dec 24 07:51:18 2002
@@ -20,7 +20,7 @@
from zope.app.services.tests.placefulsetup \
import PlacefulSetup
from zope.app.services.viewpackage import ViewPackage
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.app.services.zpt import ZPTTemplate
from zope.app.services.view import ViewService
from zope.app.interfaces.services.configuration import Active
=== Zope3/src/zope/app/services/tests/testingservicemanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/tests/testingservicemanager.py:1.1.2.2 Mon Dec 23 18:52:36 2002
+++ Zope3/src/zope/app/services/tests/testingservicemanager.py Tue Dec 24 07:51:18 2002
@@ -30,15 +30,15 @@
__implements__ = IServiceService
def getServiceDefinitions(self):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
return getNextServiceManager(self).getServiceDefinitions()
def getInterfaceFor(self, name):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
return getNextServiceManager(self).getInterfaceFor(name)
def getService(self, name):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
if hasattr(self, name):
return ContextWrapper(getattr(self, name), self, name=name)
return getNextServiceManager(self).getService(name)
@@ -46,7 +46,7 @@
getService = ContextMethod(getService)
def queryService(self, name, default=None):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
if hasattr(self, name):
return ContextWrapper(getattr(self, name), self, name=name)
return getNextServiceManager(self).queryService(name, default)