[Zope3-checkins] CVS: Zope3/lib/python/Zope/Configuration - IEmptyDirective.py:1.1 INonEmptyDirective.py:1.1 ISubdirectiveHandler.py:1.1 meta.py:1.4 ConfigurationDirectiveInterfaces.py:NONE
R. David Murray
bitz@bitdance.com
Sun, 1 Sep 2002 14:29:59 -0400
Update of /cvs-repository/Zope3/lib/python/Zope/Configuration
In directory cvs.zope.org:/tmp/cvs-serv12519/lib/python/Zope/Configuration
Modified Files:
meta.py
Added Files:
IEmptyDirective.py INonEmptyDirective.py
ISubdirectiveHandler.py
Removed Files:
ConfigurationDirectiveInterfaces.py
Log Message:
Refactor ConfigurationDirectiveInterfaces to conform to style guide
recomendation of one file per Interface definition.
=== Added File Zope3/lib/python/Zope/Configuration/IEmptyDirective.py ===
##############################################################################
#
# 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.
#
##############################################################################
"""Configuration directives that do not have subdirectives
$Id: IEmptyDirective.py,v 1.1 2002/09/01 18:29:58 rdmurray Exp $
"""
from Interface import Interface
class IEmptyDirective(Interface):
def __call__(**kw):
"""Compute configuration actions
Return a sequence of configuration actions. Each action is a
tuple with:
- A discriminator, value used to identify conflicting
actions. Actions conflict if they have the same values
for their discriminators.
- callable object
- argument tuple
- and, optionally, a keyword argument dictionary.
The callable object will be called with the argument tuple and
keyword arguments to perform the action.
"""
=== Added File Zope3/lib/python/Zope/Configuration/INonEmptyDirective.py ===
##############################################################################
#
# 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.
#
##############################################################################
"""Configuration directives that have subdirectives
$Id: INonEmptyDirective.py,v 1.1 2002/09/01 18:29:58 rdmurray Exp $
"""
from Interface import Interface
class INonEmptyDirective(Interface):
def __call__(**kw):
"""Compute complex directive handler
Return an IComplexDirectiveHandler
"""
=== Added File Zope3/lib/python/Zope/Configuration/ISubdirectiveHandler.py ===
##############################################################################
#
# 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.
#
##############################################################################
"""Psuedo-directive (or meta-meta directive) to handle subdirectives
$Id: ISubdirectiveHandler.py,v 1.1 2002/09/01 18:29:58 rdmurray Exp $
"""
from Interface import Interface
class ISubdirectiveHandler(Interface):
"""Handle subdirectives
Provide methods for registered subdirectives.
Also provide a call that can provide additional configuration actions.
"""
def __call__():
"""Return a sequence of configuration actions.
See IEmptyDirective for a definition of configuration actions."""
=== Zope3/lib/python/Zope/Configuration/meta.py 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/Configuration/meta.py:1.3 Fri Aug 30 18:06:48 2002
+++ Zope3/lib/python/Zope/Configuration/meta.py Sun Sep 1 14:29:58 2002
@@ -13,14 +13,14 @@
##############################################################################
"""Registration of registration directives
-See ConfigurationDirectiveInterfaces
+See IEmptyDirective, INonEmptyDirective, and ISubdirectiveHandler.
+$Id$
"""
-#
-from ConfigurationDirectiveInterfaces import INonEmptyDirective
-from ConfigurationDirectiveInterfaces import ISubdirectiveHandler
+from INonEmptyDirective import INonEmptyDirective
+from ISubdirectiveHandler import ISubdirectiveHandler
_directives = {}
=== Removed File Zope3/lib/python/Zope/Configuration/ConfigurationDirectiveInterfaces.py ===