[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.11 auth.py:1.14 cache.py:1.6 configure.zcml:1.19 connection.py:1.7 errorr.py:1.8 event.py:1.18 hub.py:1.6 principalannotation.py:1.4 role.py:1.4 service.py:1.11 session.py:1.9 view.py:1.10 viewpackage.py:1.7 zpt.py:1.7
Jim Fulton
jim@zope.com
Tue, 11 Mar 2003 11:12:08 -0500
Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv10749/src/zope/app/services
Modified Files:
adapter.py auth.py cache.py configure.zcml connection.py
errorr.py event.py hub.py principalannotation.py role.py
service.py session.py view.py viewpackage.py zpt.py
Log Message:
Broke the module zope/app/interfaces/services/interfaces.py, into two
separate more-focussed modules:
zope/app/interfaces/services/adapter.py, and
zope/app/interfaces/services/view.py
and also moved some interfaces to:
zope/app/interfaces/services/service.py
and adjusted various dotted names to reflect the new locations.
=== Zope3/src/zope/app/services/adapter.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/adapter.py:1.10 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/adapter.py Tue Mar 11 11:11:22 2003
@@ -31,9 +31,9 @@
from zope.proxy.context import ContextMethod
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.component.nextservice import getNextService
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
-from zope.app.interfaces.services.interfaces import IAdapterConfiguration
+from zope.app.interfaces.services.adapter import IAdapterConfiguration
class PersistentAdapterRegistry(Persistent, AdapterRegistry):
=== Zope3/src/zope/app/services/auth.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/services/auth.py:1.13 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/auth.py Tue Mar 11 11:11:22 2003
@@ -37,7 +37,7 @@
from zope.app.security.grants.principalrole import principalRoleManager
from zope.app.component.nextservice import getNextService
from zope.proxy.context import ContextMethod
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class DuplicateLogin(Exception):
=== Zope3/src/zope/app/services/cache.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/cache.py:1.5 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/cache.py Tue Mar 11 11:11:22 2003
@@ -27,7 +27,7 @@
from zope.proxy.context import ContextMethod
from zope.app.interfaces.services.event import IEventChannel
from zope.app.interfaces.event import IObjectModifiedEvent
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class ILocalCachingService(ICachingService, IEventChannel,
=== Zope3/src/zope/app/services/configure.zcml 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/configure.zcml:1.18 Sat Mar 8 16:46:08 2003
+++ Zope3/src/zope/app/services/configure.zcml Tue Mar 11 11:11:22 2003
@@ -27,7 +27,7 @@
<content class="zope.app.services.adapter.AdapterConfiguration">
<require
permission="zope.ManageServices"
- interface="zope.app.interfaces.services.interfaces.IAdapterConfiguration"
+ interface="zope.app.interfaces.services.adapter.IAdapterConfiguration"
set_schema="zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
@@ -53,7 +53,7 @@
<content class="zope.app.services.view.ViewConfiguration">
<require
permission="zope.ManageServices"
- interface="zope.app.interfaces.services.interfaces.IViewConfiguration"
+ interface="zope.app.interfaces.services.view.IViewConfiguration"
set_schema="zope.app.interfaces.services.configuration.IConfiguration"
/>
<require
@@ -65,8 +65,8 @@
<content class="zope.app.services.view.PageConfiguration">
<require
permission="zope.ManageServices"
- interface="zope.app.interfaces.services.interfaces.IPageConfiguration"
- set_schema="zope.app.interfaces.services.interfaces.IPageConfiguration"
+ interface="zope.app.interfaces.services.view.IPageConfiguration"
+ set_schema="zope.app.interfaces.services.view.IPageConfiguration"
/>
<require
permission="zope.ManageServices"
@@ -89,8 +89,8 @@
/>
<require
permission="zope.ManageServices"
- interface="zope.app.interfaces.services.interfaces.IZPTTemplate"
- set_schema="zope.app.interfaces.services.interfaces.IZPTTemplate"
+ interface="zope.app.interfaces.services.view.IZPTTemplate"
+ set_schema="zope.app.interfaces.services.view.IZPTTemplate"
/>
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
@@ -98,14 +98,14 @@
</content>
<adapter
- for="zope.app.interfaces.services.interfaces.IZPTTemplate"
+ for="zope.app.interfaces.services.view.IZPTTemplate"
provides="zope.app.interfaces.file.IReadFile"
factory=".zpt.ReadFile"
permission="zope.ManageServices"
/>
<adapter
- for="zope.app.interfaces.services.interfaces.IZPTTemplate"
+ for="zope.app.interfaces.services.view.IZPTTemplate"
provides="zope.app.interfaces.file.IWriteFile"
factory=".zpt.WriteFile"
permission="zope.ManageServices"
@@ -341,7 +341,7 @@
interface=
"zope.app.interfaces.services.connection.IConnectionConfiguration"
set_attributes="name componentPath"
- set_schema="zope.app.interfaces.services.interfaces.IPageConfiguration"
+ set_schema="zope.app.interfaces.services.view.IPageConfiguration"
/>
<require
permission="zope.ManageServices"
=== Zope3/src/zope/app/services/connection.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/connection.py:1.6 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/connection.py Tue Mar 11 11:11:22 2003
@@ -23,7 +23,7 @@
from zope.app.services.configuration import NameComponentConfigurable
from zope.app.interfaces.rdb import IConnectionService
from zope.app.interfaces.rdb import IZopeDatabaseAdapter
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class ILocalConnectionService(IConnectionService, INameComponentConfigurable):
=== Zope3/src/zope/app/services/errorr.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/errorr.py:1.7 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/errorr.py Tue Mar 11 11:11:22 2003
@@ -26,7 +26,7 @@
from zope.exceptions.exceptionformatter import format_exception
from zope.proxy.context import ContextMethod
from zope.app.interfaces.services.error import IErrorReportingService
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
#Restrict the rate at which errors are sent to the Event Log
=== Zope3/src/zope/app/services/event.py 1.17 => 1.18 ===
--- Zope3/src/zope/app/services/event.py:1.17 Sat Mar 8 16:46:08 2003
+++ Zope3/src/zope/app/services/event.py Tue Mar 11 11:11:22 2003
@@ -295,7 +295,7 @@
iterSubscriptions = ContextMethod(iterSubscriptions)
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class EventService(ServiceSubscriberEventChannel, ServiceSubscribable):
=== Zope3/src/zope/app/services/hub.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/hub.py:1.5 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/hub.py Tue Mar 11 11:11:22 2003
@@ -46,7 +46,7 @@
from zope.app.interfaces.services.hub import IObjectMovedHubEvent
from zope.app.interfaces.services.hub import IObjectRemovedHubEvent
from zope.app.interfaces.traversing import ITraverser
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class HubEvent:
"""Convenient mix-in for HubEvents"""
=== Zope3/src/zope/app/services/principalannotation.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.3 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/principalannotation.py Tue Mar 11 11:11:22 2003
@@ -28,7 +28,7 @@
# Sibling imports
from zope.app.interfaces.services.principalannotation import IPrincipalAnnotationService
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class PrincipalAnnotationService(Persistent):
"""Stores IAnnotations for IPrinicipals.
=== Zope3/src/zope/app/services/role.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/role.py:1.3 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/role.py Tue Mar 11 11:11:22 2003
@@ -24,7 +24,7 @@
from zope.app.interfaces.container import IContainer
from zope.proxy.context import ContextMethod
from zope.app.component.nextservice import getNextService
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class Role(Role, Persistent):
"Persistent Role"
=== Zope3/src/zope/app/services/service.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/service.py:1.10 Mon Mar 10 17:37:47 2003
+++ Zope3/src/zope/app/services/service.py Tue Mar 11 11:11:22 2003
@@ -59,7 +59,7 @@
from zope.app.services.configuration import NamedComponentConfiguration
from zope.app.services.package import Packages
from zope.app.interfaces.services.configuration import IUseConfigurable
-from zope.app.interfaces.services.interfaces import ILocalService
+from zope.app.interfaces.services.service import ILocalService
from zope.app.traversing import getPhysicalPathString
=== Zope3/src/zope/app/services/session.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/session.py:1.8 Mon Mar 3 18:16:13 2003
+++ Zope3/src/zope/app/services/session.py Tue Mar 11 11:11:22 2003
@@ -30,7 +30,7 @@
# Sibling imports
from zope.app.interfaces.services.session import ISessionService
from zope.app.interfaces.services.session import IConfigureSessionService
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
cookieSafeTrans = string.maketrans("+/", "-.")
=== Zope3/src/zope/app/services/view.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/view.py:1.9 Mon Mar 10 17:37:47 2003
+++ Zope3/src/zope/app/services/view.py Tue Mar 11 11:11:22 2003
@@ -41,10 +41,11 @@
from zope.app.traversing import getPhysicalRoot, traverse
from zope.exceptions import NotFoundError
-from zope.app.interfaces.services.interfaces import IViewConfiguration, IPageConfiguration
+from zope.app.interfaces.services.view import IViewConfiguration
+from zope.app.interfaces.services.view import IPageConfiguration
from zope.app.services.adapter import PersistentAdapterRegistry
from zope.configuration.exceptions import ConfigurationError
-from zope.app.interfaces.services.interfaces import ISimpleService
+from zope.app.interfaces.services.service import ISimpleService
class ViewService(Persistent):
=== Zope3/src/zope/app/services/viewpackage.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/viewpackage.py:1.6 Tue Feb 11 10:59:56 2003
+++ Zope3/src/zope/app/services/viewpackage.py Tue Mar 11 11:11:22 2003
@@ -18,7 +18,7 @@
__metaclass__ = type
from zope.app.container.btree import BTreeContainer
-from zope.app.interfaces.services.interfaces import IZPTTemplate
+from zope.app.interfaces.services.view import IZPTTemplate
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.app.traversing import getPhysicalPathString, traverse
from zope.proxy.context import getItem, getAttr
=== Zope3/src/zope/app/services/zpt.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/zpt.py:1.6 Tue Feb 11 10:59:56 2003
+++ Zope3/src/zope/app/services/zpt.py Tue Mar 11 11:11:22 2003
@@ -28,7 +28,7 @@
from zope.app.interfaces.content.file import IFileContent
from zope.pagetemplate.pagetemplate import PageTemplate
from zope.app.pagetemplate.engine import AppPT
-from zope.app.interfaces.services.interfaces import IZPTTemplate
+from zope.app.interfaces.services.view import IZPTTemplate
from zope.app.interfaces.index.text import ISearchableText
from zope.app.interfaces.file import IReadFile, IWriteFile, IFileFactory