[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - auth.py:1.1.2.2 configuration.py:1.1.2.3 configurationmanager.py:1.1.2.2 connection.py:1.1.2.2 error.py:1.1.2.2 event.py:1.1.2.3 hub.py:1.1.2.5 interfaces.py:1.1.2.2 package.py:1.1.2.2 principalannotation.py:1.1.2.2 query.py:1.1.2.3 service.py:1.1.2.5 session.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:38 -0500
Update of /cvs-repository/Zope3/src/zope/app/interfaces/services
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/app/interfaces/services
Modified Files:
Tag: NameGeddon-branch
auth.py configuration.py configurationmanager.py connection.py
error.py event.py hub.py interfaces.py package.py
principalannotation.py query.py service.py session.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/app/interfaces/services/auth.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/auth.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/auth.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
=== Zope3/src/zope/app/interfaces/services/configuration.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/interfaces/services/configuration.py:1.1.2.2 Mon Dec 23 15:49:38 2002
+++ Zope3/src/zope/app/interfaces/services/configuration.py Tue Dec 24 21:20:36 2002
@@ -192,7 +192,7 @@
The registry must be returned in the context of the context of
the configurable.
-
+
"""
def createConfigurationsFor(configuration):
=== Zope3/src/zope/app/interfaces/services/configurationmanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/configurationmanager.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/configurationmanager.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
@@ -47,4 +47,3 @@
"""
__doc__ = IConfigurationManager.__doc__ + __doc__
-
=== Zope3/src/zope/app/interfaces/services/connection.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/connection.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/connection.py Tue Dec 24 21:20:36 2002
@@ -25,4 +25,3 @@
Connection configurations are dependent on the database adapters that they
configure. They register themselves as component dependents.
"""
-
=== Zope3/src/zope/app/interfaces/services/error.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/error.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/error.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -19,9 +19,9 @@
from zope.interface import Interface
class IErrorReportingService(Interface):
- """Error Reporting Service Interface.
+ """Error Reporting Service Interface.
"""
-
+
def raising(info, request=None):
"""Logs an exception.
"""
@@ -42,5 +42,5 @@
"""
def getLogEntryById(id):
- """Return LogEntry by ID
- """
+ """Return LogEntry by ID
+ """
=== Zope3/src/zope/app/interfaces/services/event.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/interfaces/services/event.py:1.1.2.2 Mon Dec 23 15:49:38 2002
+++ Zope3/src/zope/app/interfaces/services/event.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -20,10 +20,10 @@
from zope.interfaces.event import IIndirectSubscriber
class IPathSubscriber(IIndirectSubscriber):
-
+
def __init__(wrapped_subscriber):
"""creates new PathSubscriber for the given wrapped_subscriber"""
-
+
subscriber_path = Attribute(
"""the slash-delineated physical path to the subscriber"""
)
=== Zope3/src/zope/app/interfaces/services/hub.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/interfaces/services/hub.py:1.1.2.4 Tue Dec 24 07:51:09 2002
+++ Zope3/src/zope/app/interfaces/services/hub.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Object hub interfaces.
@@ -42,55 +42,55 @@
class IObjectHub(IHubEventChannel):
"""ObjectHub.
-
+
Receives Object Modify Events from the Event Service, and
changes these into Hub Id Object Modify Events, then passes
these on to its subscribers.
-
+
To map Object Modify Events onto Hub Id Object Modify Events, take
the location from the Object Modify Event, look up the Hub Id for this
location, and create an equivalent Hub Id Object Modify Event using this
Hub Id.
-
+
Note that we are concerned with locations and not with Objects.
An object may have more than one location. That doesn't concern
us here.
-
+
We're only interested in what happens during the time during which
an object is registered with the hub -- between ObjectRegistered
and ObjectUnregistered events. As one consequence of that, we do
care about object removals, but not (directly) about object
additions.
-
+
Table of decisions about maintaining the location<->Hub Id lookup:
-
+
Register
-
+
if location already in lookup:
raise ObjectHubError, as this is implies bad state somewhere
generate new hub id
place hub id<->location into lookup, to say that we have an
interesting object
-
+
send out hub id object register event to subscribers
-
+
Unregister
-
+
if location not in lookup:
raise ObjectHubError, as this is implies bad state somewhere
remove location<->hub id from lookup
-
+
send out hub id unregister event to subscribers
-
+
Modify
-
+
if location not in lookup:
ignore this event, as we're not interested in this object
else:
look up hub id for the location
send out hub id object modify event to subscribers
-
- Move
+
+ Move
if old_location not in lookup:
ignore this event, as we're not interested in this object
@@ -113,32 +113,32 @@
remove hub id<->old_location
send out hub id object remove event to subscribers
"""
-
+
def getHubId(obj_or_loc):
"""Returns the hub id int that is mapped to the given location
or wrapped object.
-
+
Location is either a unicode, or a tuple of unicodes, or an
ascii string, or a tuple of ascii strings.
(See Zope/App/Traversing/__init__.py)
It must be absolute, so if it is a string it must start with a u'/',
and if it is a tuple, it must start with an empty string.
-
+
(u'',u'whatever',u'whatever2')
u'/whatever/whatever2'
-
+
If there is no hub id, raise NotFoundError.
"""
-
+
def getLocation(hubid):
"""Returns a location as a tuple of unicodes.
-
+
If there is no location, raise NotFoundError.
"""
-
+
def getObject(hubid):
"""Returns an object for the given hub id.
-
+
If there is no such hub id, raise NotFoundError.
If there is no such object, passes through whatever error
the traversal service raises.
@@ -146,17 +146,17 @@
def register(obj_or_loc):
"""Returns a new hub id for the given location or the given
- wrapped object if it is not already registered.
+ wrapped object if it is not already registered.
- It also emits a HubIdObjectRegisteredEvent. Raises an
- ObjectHubError if the location was previously registered.
+ It also emits a HubIdObjectRegisteredEvent. Raises an
+ ObjectHubError if the location was previously registered.
"""
def unregister(obj_or_loc_or_hubid):
"""Unregister an object by wrapped object, by location, or by hubid.
- It also emits a HubIdObjectUnregisteredEvent.
- If the hub id or location wasn't registered a
+ It also emits a HubIdObjectUnregisteredEvent.
+ If the hub id or location wasn't registered a
NotFoundError is raised.
"""
@@ -186,7 +186,7 @@
hubid = Attribute("the object's hub-unique id")
location = Attribute("An optional object location.")
-
+
class IRegistrationHubEvent(IHubEvent):
"""The hub registration status of an object has changed
@@ -199,12 +199,12 @@
class IObjectUnregisteredHubEvent(IRegistrationHubEvent):
"""We are no longer interested in this object."""
-
-
+
+
class IObjectModifiedHubEvent(IHubEvent):
"""An object with a hub id has been modified."""
-
-
+
+
class IObjectMovedHubEvent(IHubEvent):
"""An object with a hub id has had its context changed. Typically, this
means that it has been moved."""
=== Zope3/src/zope/app/interfaces/services/interfaces.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/interfaces.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/interfaces.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Service interfaces
@@ -129,7 +129,7 @@
'options' variable.
"""
-
+
class IPageConfigurationInfo(IViewConfigurationInfo):
factoryName = BytesLine(
@@ -151,5 +151,3 @@
def getView(object, request):
"""Return a page for the object.
"""
-
-
=== Zope3/src/zope/app/interfaces/services/package.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/package.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/package.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
from zope.app.interfaces.container import IContainer
@@ -24,7 +24,7 @@
doc = IPackages.__doc__ + """
$Id$
"""
-
+
"""XXX short summary goes here.
@@ -34,16 +34,16 @@
$Id$
"""
-from zope.app.interfaces.container import IContainer
+from zope.app.interfaces.container import IContainer
class IPackage(IContainer):
"""Component and component configuration containers.
"""
-
-"""IPackageAdding
+
+"""IPackageAdding
$Id$
"""
@@ -54,4 +54,3 @@
namespace, but has a similar functionality as a Folder. Therefore there
are views that overlap; this interface was created so that there are no
configuration conflicts."""
-
=== Zope3/src/zope/app/interfaces/services/principalannotation.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/principalannotation.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/principalannotation.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Service for storing IAnnotations for principals."""
@@ -28,5 +28,3 @@
def hasAnnotation(principal):
"""Return boolean indicating if given IPrincipal has IAnnotations."""
-
-
=== Zope3/src/zope/app/interfaces/services/query.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/interfaces/services/query.py:1.1.2.2 Mon Dec 23 15:49:38 2002
+++ Zope3/src/zope/app/interfaces/services/query.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""XXX short summary goes here.
@@ -21,7 +21,7 @@
from zope.interface import Interface, Attribute
class IQueryProcessor(Interface):
-
+
input_interface = Attribute("The __implements__-like specification "
"for the input interfaces.")
output_interface = Attribute("The __implements__-like specification "
@@ -56,4 +56,3 @@
The input is adapted to the input interface that is registered for
the query_id.'''
-
=== Zope3/src/zope/app/interfaces/services/service.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/interfaces/services/service.py:1.1.2.4 Tue Dec 24 18:20:25 2002
+++ Zope3/src/zope/app/interfaces/services/service.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -35,7 +35,7 @@
import INameComponentConfigurable
class IComponentManager(Interface):
-
+
def queryComponent(type=None, filter=None, all=0):
"""Return all components that match the given type and filter
@@ -48,9 +48,9 @@
all -- A flag indicating whether all component managers in
this place should be queried, or just the local one.
-
+
"""
-
+
class IReadServiceManagerContainer(Interface):
@@ -84,14 +84,14 @@
class IBindingAware(Interface):
-
+
def bound(name):
"""Inform a service components that it's providing a service
Called when an immediately-containing service manager binds
this object to perform the named service.
"""
-
+
def unbound(name):
"""Inform a service components that it's no longer providing a service
=== Zope3/src/zope/app/interfaces/services/session.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/interfaces/services/session.py:1.1.2.1 Mon Dec 23 14:31:53 2002
+++ Zope3/src/zope/app/interfaces/services/session.py Tue Dec 24 21:20:36 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Interfaces for session service."""
@@ -25,7 +25,7 @@
If the request doesn't have an attached sessionId a new one will
be generated.
-
+
This will do whatever is possible to do the HTTP request to ensure
the session id will be preserved. Depending on the specific
method, further action might be necessary on the part of the user.
@@ -35,7 +35,7 @@
def invalidate(sessionId):
"""Destroy all attached data and invalidate the session."""
-
+
def getDataManager(name):
"""Get the ISessionDataManager for given name.
@@ -45,7 +45,7 @@
class IConfigureSessionService(Interface):
"""Configuration for ISessionService."""
-
+
def registerDataManager(name, dataManager):
"""Register ISessionDataManager under given name.
@@ -61,11 +61,11 @@
In general, a data object will be stored for each sessionId requested from
the ISessionDataManager.
-
+
Sub-interfaces should specify the interface(s) implemented by the data
objects.
"""
-
+
def getDataObject(sessionId):
"""Returns data attached to session.