[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.1.2.3 auth.py:1.1.2.3 cache.py:1.1.2.2 configuration.py:1.1.2.4 configurationmanager.py:1.1.2.2 configure.zcml:1.1.2.2 connection.py:1.1.2.2 event.py:1.1.2.4 field.py:1.1.2.2 role.py:1.1.2.2 service.py:1.1.2.3 test_cookiesessionservice.py:1.1.2.2 view.py:1.1.2.3 viewpackage.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
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/services
Modified Files:
Tag: NameGeddon-branch
adapter.py auth.py cache.py configuration.py
configurationmanager.py configure.zcml connection.py event.py
field.py role.py service.py test_cookiesessionservice.py
view.py viewpackage.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/adapter.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/adapter.py:1.1.2.2 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/adapter.py Tue Dec 24 07:51:17 2002
@@ -48,7 +48,7 @@
self._byName = PersistentDict()
def queryConfigurationsFor(self, configuration, default=None):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"
+ "See IConfigurable"
# XXX Need to add named adapter support
return self.queryConfigurations(
configuration.forInterface, configuration.providedInterface, '',
@@ -73,7 +73,7 @@
queryConfigurations = ContextMethod(queryConfigurations)
def createConfigurationsFor(self, configuration):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"
+ "See IConfigurable"
# XXX Need to add named adapter support
return self.createConfigurations(
configuration.forInterface, configuration.providedInterface, '')
@@ -97,7 +97,7 @@
createConfigurations = ContextMethod(createConfigurations)
def getAdapter(self, object, interface, name=''):
- "See Zope.ComponentArchitecture.IAdapterService.IAdapterService"
+ "See IAdapterService"
adapter = self.queryAdapter(object, interface, None, name)
if adapter is None:
raise ComponentLookupError(object, interface)
@@ -106,7 +106,7 @@
getAdapter = ContextMethod(getAdapter)
def queryAdapter(self, object, interface, default=None, name=''):
- "See Zope.ComponentArchitecture.IAdapterService.IAdapterService"
+ "See IAdapterService"
if not name and interface.isImplementedBy(object):
return object
=== Zope3/src/zope/app/services/auth.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/auth.py:1.1.2.2 Mon Dec 23 17:22:41 2002
+++ Zope3/src/zope/app/services/auth.py Tue Dec 24 07:51:17 2002
@@ -53,15 +53,8 @@
def getAllUsers(self):
return self.values()
- ############################################################
- # Implementation methods for interface
- # Zope.App.OFS.Services.AuthenticationService.AuthenticationService.
-
- ######################################
- # from: Zope.App.Security.IAuthenticationService.IAuthenticationService
-
def authenticate(self, request):
- 'See Zope.App.Security.IAuthenticationService.IAuthenticationService'
+ 'See IAuthenticationService'
a = queryAdapter(request, ILoginPassword, None)
if a is not None:
login = a.getLogin()
@@ -74,23 +67,23 @@
return None
def unauthenticatedPrincipal(self):
- 'See Zope.App.Security.IAuthenticationService.IAuthenticationService'
+ 'See IAuthenticationService'
return None
def unauthorized(self, id, request):
- 'See Zope.App.Security.IAuthenticationService.IAuthenticationService'
+ 'See IAuthenticationService'
# XXX This is a mess. request has no place here!
if id is None:
a = getAdapter(request, ILoginPassword)
a.needLogin(realm="zope")
def getPrincipal(self, id):
- 'See Zope.App.Security.IAuthenticationService.IAuthenticationService'
+ 'See IAuthenticationService'
r = self.get(id)
return r
def getPrincipals(self, name):
- 'See Zope.App.Security.IAuthenticationService.IAuthenticationService'
+ 'See IAuthenticationService'
name = name.lower()
return [p for p in self.values()
if p.getTitle().lower().startswith(name) or
@@ -122,63 +115,50 @@
self.__login = login
self.__pw = pw
- ############################################################
- # Implementation methods for interface
- # Zope.App.OFS.Services.AuthenticationService.IUser.
-
- ######################################
- # from: Zope.App.OFS.Services.AuthenticationService.IUser.IReadUser
-
def getLogin(self):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IReadUser'
+ 'See IReadUser'
return self.__login
def getRoles(self):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IReadUser'
+ 'See IReadUser'
annotations = AttributeAnnotations(self)
roles = annotations.get('roles', [])
roles = removeAllProxies(roles)
return roles
def validate(self, pw):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IReadUser'
+ 'See IReadUser'
return pw == self.__pw
- ######################################
- # from: Zope.App.Security.IPrincipal.IPrincipal
-
def getId(self):
- 'See Zope.App.Security.IPrincipal.IPrincipal'
+ 'See IPrincipal'
return self.__id
def getTitle(self):
- 'See Zope.App.Security.IPrincipal.IPrincipal'
+ 'See IPrincipal'
return self.__title
def getDescription(self):
- 'See Zope.App.Security.IPrincipal.IPrincipal'
+ 'See IPrincipal'
return self.__description
- ######################################
- # from: Zope.App.OFS.Services.AuthenticationService.IUser.IWriteUser
-
def setTitle(self, title):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IWriteUser'
+ 'See IWriteUser'
self.__title = title
def setDescription(self, description):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IWriteUser'
+ 'See IWriteUser'
self.__description = description
def setLogin(self, login):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IWriteUser'
+ 'See IWriteUser'
def setPassword(self, password):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IWriteUser'
+ 'See IWriteUser'
self.__pw = password
def setRoles(self, roles):
- 'See Zope.App.OFS.Services.AuthenticationService.IUser.IReadUser'
+ 'See IReadUser'
annotations = AttributeAnnotations(self)
annotations['roles'] = roles
=== Zope3/src/zope/app/services/cache.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/cache.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/cache.py Tue Dec 24 07:51:17 2002
@@ -52,7 +52,7 @@
NameComponentConfigurable.__init__(self)
def getCache(wrapped_self, name):
- 'See Zope.App.Caching.ICachingService.ICachingService'
+ 'See ICachingService'
cache = wrapped_self.queryActiveComponent(name)
if cache:
return cache
@@ -63,7 +63,7 @@
getCache = ContextMethod(getCache)
def queryCache(wrapped_self, name, default=None):
- 'See Zope.App.Caching.ICachingService.ICachingService'
+ 'See ICachingService'
try:
return wrapped_self.getCache(name)
except KeyError:
@@ -71,7 +71,7 @@
queryCache = ContextMethod(queryCache)
def getAvailableCaches(wrapped_self):
- 'See Zope.App.Caching.ICachingService.ICachingService'
+ 'See ICachingService'
caches = {}
for name in wrapped_self.listConfigurationNames():
registry = wrapped_self.queryConfigurations(name)
=== Zope3/src/zope/app/services/configuration.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/configuration.py:1.1.2.3 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/configuration.py Tue Dec 24 07:51:17 2002
@@ -259,7 +259,7 @@
pass
def manage_beforeDelete(self, configuration, container):
- "See Zope.App.OFS.Container.IDeleteNotifiable"
+ "See IDeleteNotifiable"
objectstatus = configuration.status
@@ -298,7 +298,7 @@
def __init__(self, name, component_path, permission=None, *args, **kw):
self.componentPath = component_path
- if permission == 'Zope.Public':
+ if permission == 'zope.Public':
permission = CheckerPublic
self.permission = permission
super(NamedComponentConfiguration, self).__init__(name, *args, **kw)
@@ -337,14 +337,14 @@
getComponent = ContextMethod(getComponent)
def manage_afterAdd(self, configuration, container):
- "See Zope.App.OFS.Container.IAddNotifiable"
+ "See IAddNotifiable"
component = configuration.getComponent()
dependents = getAdapter(component, IDependable)
objectpath = getPhysicalPathString(configuration)
dependents.addDependent(objectpath)
def manage_beforeDelete(self, configuration, container):
- "See Zope.App.OFS.Container.IDeleteNotifiable"
+ "See IDeleteNotifiable"
super(NamedComponentConfiguration, self
).manage_beforeDelete(configuration, container)
component = configuration.getComponent()
@@ -364,25 +364,23 @@
super(NameConfigurable, self).__init__(*args, **kw)
def queryConfigurationsFor(wrapped_self, cfg, default=None):
- """See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"""
+ """See IConfigurable"""
return wrapped_self.queryConfigurations(cfg.name, default)
queryConfigurationsFor = ContextMethod(queryConfigurationsFor)
def queryConfigurations(wrapped_self, name, default=None):
- """See
- Zope.App.OFS.Services.ConfigurationInterfaces.INameConfigurable"""
+ """See INameConfigurable"""
registry = wrapped_self._bindings.get(name, default)
return ContextWrapper(registry, wrapped_self)
queryConfigurations = ContextMethod(queryConfigurations)
def createConfigurationsFor(wrapped_self, cfg):
- """See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"""
+ """See IConfigurable"""
return wrapped_self.createConfigurations(cfg.name)
createConfigurationsFor = ContextMethod(createConfigurationsFor)
def createConfigurations(wrapped_self, name):
- """See
- Zope.App.OFS.Services.ConfigurationInterfaces.INameConfigurable"""
+ """See INameConfigurable"""
try:
registry = wrapped_self._bindings[name]
except KeyError:
@@ -392,8 +390,7 @@
createConfigurations = ContextMethod(createConfigurations)
def listConfigurationNames(wrapped_self):
- """See
- Zope.App.OFS.Services.ConfigurationInterfaces.INameConfigurable"""
+ """See INameConfigurable"""
return filter(wrapped_self._bindings.get,
wrapped_self._bindings.keys())
@@ -405,8 +402,7 @@
__implements__ = INameComponentConfigurable
def queryActiveComponent(wrapped_self, name, default=None):
- """See Zope.App.OFS.Services.ConfigurationInterfaces
- .INameComponentConfigurable"""
+ """See INameComponentConfigurable"""
registry = wrapped_self.queryConfigurations(name)
if registry:
configuration = registry.active()
=== Zope3/src/zope/app/services/configurationmanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/configurationmanager.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/configurationmanager.py Tue Dec 24 07:51:17 2002
@@ -37,7 +37,7 @@
self._next = 0
def __getitem__(self, key):
- "See Zope.App.OFS.Container.IContainer.IItemContainer"
+ "See IItemContainer"
v = self.get(key)
if v is None:
raise KeyError, key
@@ -72,14 +72,14 @@
return len(self._data)
def setObject(self, key, object):
- "See Zope.App.OFS.Container.IContainer.IWriteContainer"
+ "See IWriteContainer"
self._next += 1
key = str(self._next)
self._data += ((key, object), )
return key
def __delitem__(self, key):
- "See Zope.App.OFS.Container.IContainer.IWriteContainer"
+ "See IWriteContainer"
if key not in self:
raise KeyError, key
self._data = tuple(
=== Zope3/src/zope/app/services/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/configure.zcml:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/configure.zcml Tue Dec 24 07:51:17 2002
@@ -6,7 +6,7 @@
<!-- Configuration registries -->
<content class="zope.app.services.configuration.ConfigurationRegistry">
- <require permission="Zope.ManageServices"
+ <require permission="zope.ManageServices"
interface="zope.app.interfaces.services.configuration.IConfigurationRegistry"
/>
</content>
@@ -15,10 +15,10 @@
<content class="zope.app.services.adapter.AdapterService">
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
- <factory id="Zope.App.OFS.Services.AdapterService"
- permission="Zope.ManageServices"
+ <factory id="zope.app.services.AdapterService"
+ permission="zope.ManageServices"
/>
- <require permission="Zope.ManageServices"
+ <require permission="zope.ManageServices"
interface="zope.app.interfaces.services.configuration.IConfigurable"
attributes="getRegisteredMatching"
/>
@@ -26,13 +26,13 @@
<content class="zope.app.services.adapter.AdapterConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.interfaces.IAdapterConfiguration"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable"
/>
</content>
@@ -41,10 +41,10 @@
<content class="zope.app.services.view.ViewService">
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
- <factory id="Zope.App.OFS.Services.ViewService"
- permission="Zope.ManageServices"
+ <factory id="zope.app.services.ViewService"
+ permission="zope.ManageServices"
/>
- <require permission="Zope.ManageServices"
+ <require permission="zope.ManageServices"
interface="zope.app.interfaces.services.configuration.IConfigurable"
attributes="getRegisteredMatching"
/>
@@ -52,26 +52,26 @@
<content class="zope.app.services.view.ViewConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.interfaces.IViewConfiguration"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable"
/>
</content>
<content class="zope.app.services.view.PageConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.interfaces.IPageConfiguration"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable"
/>
</content>
@@ -80,17 +80,17 @@
<content class="zope.app.services.zpt.ZPTTemplate">
<factory
- id="Zope.app.services.zpt.template"
- permission="Zope.ManageServices"
+ id="zope.app.services.zpt.template"
+ permission="zope.ManageServices"
title="ZPT Template"
description="Page Template" />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="__call__" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.interfaces.IZPTTemplate"
set_schema="zope.app.interfaces.services.interfaces.IZPTTemplate" />
@@ -124,13 +124,13 @@
<content class="zope.app.services.role.RoleService">
<factory
id="RoleService"
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
/>
<require
- permission="Zope.Security"
+ permission="zope.Security"
interface="zope.app.interfaces.security.IRoleService" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IContainer" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
@@ -138,7 +138,7 @@
<content class="zope.app.services.role.Role">
<factory />
<require
- permission="Zope.Security"
+ permission="zope.Security"
interface="zope.app.interfaces.security.IRole" />
</content>
@@ -157,11 +157,11 @@
<content class="zope.app.services.session.CookieSessionService">
<require
- permission="Zope.Public"
+ permission="zope.Public"
interface="zope.app.interfaces.services.session.ISessionService" />
<factory
id="ISessionService"
- permission="Zope.ManageServices" />
+ permission="zope.ManageServices" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
@@ -175,30 +175,30 @@
xmlns='http://namespaces.zope.org/zope'>
<content class="zope.app.services.cache.CachingService">
- <factory id="CachingService" permission="Zope.ManageServices" />
+ <factory id="CachingService" permission="zope.ManageServices" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.cache.cache.ICachingService"
attributes="queryConfigurations queryConfigurationsFor
listConfigurationNames" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IContainer" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
<content class="zope.app.services.cache.CacheConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.cache.ICacheConfiguration"
set_attributes="name componentPath"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration" />
+ "zope.app.interfaces.services.configuration.IConfiguration" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IAddNotifiable" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable" />
</content>
@@ -214,23 +214,23 @@
<content class="zope.app.services.service.ServiceManager">
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.ISimpleReadContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.service.IServiceManager" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
<content class="zope.app.services.package.Packages">
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.IReadContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IWriteContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.service.IComponentManager" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -238,10 +238,10 @@
<content class="zope.app.services.package.Package">
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.IReadContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IWriteContainer" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -249,27 +249,27 @@
<content class="zope.app.services.configurationmanager.ConfigurationManager">
<factory
- id = "Zope.App.OFS.Serviceszope.app.services.service.ServiceManagerConfigurationManager"
- permission = "Zope.ManageServices"
+ id = "zope.app.services.service.ServiceManagerConfigurationManager"
+ permission = "zope.ManageServices"
title = "Configuration Manager" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.IReadContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IWriteContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.configurationmanager.IOrderedContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
<content class="zope.app.services.module.Manager">
<require
- permission="Zope.ManageCode"
+ permission="zope.ManageCode"
interface="zodb.code.interfaces.IPersistentModuleManager" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
@@ -277,18 +277,18 @@
<content class="zope.app.services.service.ServiceConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.service.IServiceConfiguration"
set_attributes="serviceType componentPath"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IAddNotifiable"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable"
/>
@@ -296,19 +296,19 @@
<content class="zope.app.services.viewpackage.ViewPackage">
<factory
- id = "Zope.App.OFS.Services.ServiceManagerzope.app.services.viewpackage.ViewPackage"
- permission = "Zope.ManageServices"
+ id = "zope.app.services.ViewPackage"
+ permission = "zope.ManageServices"
title = "View Package" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.container.IReadContainer" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IWriteContainer"
set_schema="zope.app.interfaces.services.servicemanager.interfaces.IViewPackageInfo"
/>
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.servicemanager.interfaces.IViewPackageInfo"
/>
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -324,10 +324,10 @@
xmlns='http://namespaces.zope.org/zope'>
<content class="zope.app.services.connection.ConnectionService">
- <factory id="ConnectionService" permission="Zope.ManageServices" />
+ <factory id="ConnectionService" permission="zope.ManageServices" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.rdb.IConnectionService"
attributes="queryConfigurations queryConfigurationsFor
listConfigurationNames" />
@@ -335,16 +335,16 @@
<content class="zope.app.services.connection.ConnectionConfiguration">
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.services.connection.IConnectionConfiguration"
set_attributes="name componentPath"
set_schema=
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration" />
+ "zope.app.interfaces.services.configuration.IConfiguration" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IAddNotifiable" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IDeleteNotifiable" />
</content>
@@ -363,11 +363,11 @@
<content class="zope.app.services.principalannotation.PrincipalAnnotationService">
<require
- permission="Zope.Public"
+ permission="zope.Public"
interface="zope.app.interfaces.services.principalannotation.IPrincipalAnnotationService" />
<factory
id="IPrincipalAnnotationService"
- permission="Zope.ManageServices" />
+ permission="zope.ManageServices" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
@@ -387,13 +387,13 @@
<factory
id='Events'
- permission='Zope.ManageServices' />
+ permission='zope.ManageServices' />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="publish notify" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
attributes="bound unbound subscribe unsubscribe subscribeOnBind
unsubscribedFrom subscribedTo" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -414,11 +414,11 @@
<content class='zope.app.services.errorr.ErrorReportingService'>
<require
- permission="Zope.Public"
+ permission="zope.Public"
interface="zope.app.interfaces.services.error.IErrorReportingService" />
<factory
id='ErrorReportingService'
- permission='Zope.Public' />
+ permission='zope.Public' />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
@@ -447,13 +447,13 @@
<content class='zope.app.services.hub.ObjectHub'>
<factory
id='ObjectHub'
- permission='Zope.ManageServices' />
+ permission='zope.ManageServices' />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="notify lookupRuid lookupLocation getObject
register unregister" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
attributes="bound unbound subscribe unsubscribe subscribeOnBind
unsubscribedFrom subscribedTo" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -482,19 +482,19 @@
<content class="zope.app.services.auth.AuthenticationService">
- <factory id="AuthenticationService" permission="Zope.ManageServices" />
+ <factory id="AuthenticationService" permission="zope.ManageServices" />
<!-- XXX Should you *really* be able to get all this with just the
view permission? -->
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.security.IAuthenticationService" />
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="getAllUsers" />
<require
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
interface="zope.app.interfaces.container.IContainer" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
@@ -505,12 +505,12 @@
<!-- User Directives -->
<content class="zope.app.services.auth.User">
- <factory id="User" permission="Zope.ManageServices" />
+ <factory id="User" permission="zope.ManageServices" />
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.app.interfaces.services.auth.IReadUser" />
<require
- permission="Zope.ManageContent"
+ permission="zope.ManageContent"
interface="zope.app.interfaces.services.auth.IWriteUser" />
<implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
</content>
=== Zope3/src/zope/app/services/connection.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/connection.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/connection.py Tue Dec 24 07:51:17 2002
@@ -38,7 +38,7 @@
super(ConnectionService, self).__init__()
def getConnection(self, name):
- 'See Zope.App.RDB.IConnectionService.IConnectionService'
+ 'See IConnectionService'
adapter = self.queryActiveComponent(name)
if adapter is not None:
return adapter()
@@ -50,7 +50,7 @@
getConnection = ContextMethod(getConnection)
def queryConnection(self, name, default=None):
- 'See Zope.App.RDB.IConnectionService.IConnectionService'
+ 'See IConnectionService'
try:
return self.getConnection(name)
except KeyError:
@@ -59,7 +59,7 @@
queryConnection = ContextMethod(queryConnection)
def getAvailableConnections(self):
- 'See Zope.App.RDB.IConnectionService.IConnectionService'
+ 'See IConnectionService'
connections = {}
for name in self.listConfigurationNames():
registry = self.queryConfigurations(name)
=== Zope3/src/zope/app/services/event.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/services/event.py:1.1.2.3 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/event.py Tue Dec 24 07:51:17 2002
@@ -163,8 +163,8 @@
_serviceName = None # should be replaced; usually done in "bound"
# method of a subclass
- # uses (and needs) __init__ from Zope.Event.Subscribable (via
- # LocalSubscribable)
+ # uses (and needs) __init__ from zope.event.subscribable (via
+ # localsubscribable)
def unsubscribe(wrapped_self,
subscriber,
@@ -260,8 +260,8 @@
__implements__ = IEventChannel
- # needs __init__ from Zope.Event.Subscribable (via
- # LocalSubscribable)!!
+ # needs __init__ from zope.event.subscribable (via
+ # localsubscribable)!!
def notify(wrapped_self, event):
clean_self = removeAllProxies(wrapped_self)
=== Zope3/src/zope/app/services/field.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/field.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/field.py Tue Dec 24 07:51:17 2002
@@ -20,7 +20,7 @@
from zope.schema.interfaces import IField
from zope.schema import Field
from zope.schema.interfaces import ValidationError
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.app.component.interfacefield import InterfaceField
from zope.exceptions import NotFoundError
=== Zope3/src/zope/app/services/role.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/role.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/role.py Tue Dec 24 07:51:17 2002
@@ -44,10 +44,6 @@
__implements__ = ILocalRoleService
- ############################################################
- # Implementation methods for interface
- # Zope.App.Security.IRoleService.
-
def getRole(wrapped_self, rid):
'''See interface IRoleService'''
try:
=== Zope3/src/zope/app/services/service.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/service.py:1.1.2.2 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/service.py Tue Dec 24 07:51:17 2002
@@ -27,10 +27,6 @@
__implements__ = IServiceManagerContainer
- ############################################################
- # Implementation methods for interface
- # Zope.App.ComponentArchitecture.IServiceManagerContainer.
-
def hasServiceManager(self):
'''See interface IReadServiceManagerContainer'''
return hasattr(self, '_ServiceManagerContainer__sm')
@@ -157,7 +153,7 @@
self.Packages = Packages()
def getServiceDefinitions(wrapped_self):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
# Get the services defined here and above us, if any (as held
# in a ServiceInterfaceService, presumably)
@@ -170,7 +166,7 @@
getServiceDefinitions = ContextMethod(getServiceDefinitions)
def queryService(wrapped_self, name, default=None):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
try:
return wrapped_self.getService(name)
except ComponentLookupError:
@@ -178,7 +174,7 @@
queryService = ContextMethod(queryService)
def getService(wrapped_self, name):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
# This is rather tricky. Normally, getting a service requires
# the use of other services, like the adapter service. We
@@ -205,7 +201,7 @@
def getInterfaceFor(wrapped_self, service_type):
- "See Zope.ComponentArchitecture.IServiceService.IServiceService"
+ "See IServiceService"
for type, interface in wrapped_self.getServiceDefinitions():
if type == service_type:
return interface
@@ -213,18 +209,11 @@
raise NameError(service_type)
getInterfaceFor = ContextMethod(getInterfaceFor)
- ############################################################
- # Implementation methods for interface
- # Zope.App.OFS.Services.ServiceManager.IComponentManager.
-
def queryComponent(wrapped_self, type=None, filter=None, all=0):
Packages = ContextWrapper(wrapped_self.Packages, wrapped_self,
name='Packages')
return Packages.queryComponent(type, filter, all)
queryComponent = ContextMethod(queryComponent)
-
- #
- ############################################################
# We provide a mapping interface for traversal, but we only expose
=== Zope3/src/zope/app/services/test_cookiesessionservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/services/test_cookiesessionservice.py:1.1.2.1 Mon Dec 23 14:32:22 2002
+++ Zope3/src/zope/app/services/test_cookiesessionservice.py Tue Dec 24 07:51:17 2002
@@ -97,7 +97,7 @@
svc = self.svc
svc.registerDataManager("dm", dm)
req = FakeRequest()
- from Zope.App.OFS.Services.SessionService import getSessionDataObject
+ from zope.app.services.session import getSessionDataObject
d = getSessionDataObject(self.rootFolder, req, "dm")
d["a"] = "b"
self.assert_(d is dm.getDataObject(svc.getSessionId(req)))
=== Zope3/src/zope/app/services/view.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/view.py:1.1.2.2 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/view.py Tue Dec 24 07:51:17 2002
@@ -33,7 +33,7 @@
from zope.component import getSkin
from zope.proxy.introspection import removeAllProxies
-from Zope.App.Traversing import getPhysicalRoot, traverse
+from zope.app.traversing import getPhysicalRoot, traverse
from zope.exceptions import NotFoundError
from zope.app.interfaces.services.interfaces import IViewConfiguration, IPageConfiguration
@@ -47,7 +47,7 @@
self._layers = PersistentDict()
def queryConfigurationsFor(self, configuration, default=None):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"
+ "See IConfigurable"
return self.queryConfigurations(
configuration.viewName, configuration.layer,
configuration.forInterface, configuration.presentationType,
@@ -77,7 +77,7 @@
queryConfigurations = ContextMethod(queryConfigurations)
def createConfigurationsFor(self, configuration):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurable"
+ "See IConfigurable"
return self.createConfigurations(
configuration.viewName, configuration.layer,
configuration.forInterface, configuration.presentationType)
@@ -150,7 +150,7 @@
queryView = ContextMethod(queryView)
def getDefaultViewName(self, object, request):
- "See Zope.ComponentArchitecture.IViewService.IViewService"
+ "See IViewService"
name = self.queryDefaultViewName(object, request)
@@ -163,7 +163,7 @@
getDefaultViewName = ContextMethod(getDefaultViewName)
def queryDefaultViewName(self, object, request, default=None):
- "See Zope.ComponentArchitecture.IViewService.IViewService"
+ "See IViewService"
# XXX: need to do our own defaults as well.
views = getNextService(self, 'Views')
=== Zope3/src/zope/app/services/viewpackage.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/services/viewpackage.py:1.1.2.2 Mon Dec 23 18:52:35 2002
+++ Zope3/src/zope/app/services/viewpackage.py Tue Dec 24 07:51:17 2002
@@ -20,7 +20,7 @@
from zope.app.container.btree import BTreeContainer
from zope.app.interfaces.services.interfaces import IZPTTemplate
from zope.publisher.interfaces.browser import IBrowserPresentation
-from Zope.App.Traversing import getPhysicalPathString, traverse
+from zope.app.traversing import getPhysicalPathString, traverse
from zope.proxy.context import getItem, getAttr
from zope.proxy.context import ContextMethod
from zope.app.interfaces.services.configuration import Active
@@ -68,8 +68,8 @@
setObject = ContextMethod(setObject)
def activated(self):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "See IConfiguration"
def deactivated(self):
- "See Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration"
+ "See IConfiguration"