[CMF-checkins] CVS: CMF/CMFSetup - __init__.py:1.6 actions.py:1.12
context.py:1.14 differ.py:1.2 factory.py:1.2
interfaces.py:1.15 permissions.py:1.2 registry.py:1.17
skins.py:1.7 tool.py:1.17 typeinfo.py:1.11 utils.py:1.12
Yvo Schubbe
y.2004_ at wcm-solutions.de
Fri Aug 6 04:20:36 EDT 2004
Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv896/CMFSetup
Modified Files:
__init__.py actions.py context.py differ.py factory.py
interfaces.py permissions.py registry.py skins.py tool.py
typeinfo.py utils.py
Log Message:
- added copyright headers
- whitespace cleanup
- some other minor cleanup
=== CMF/CMFSetup/__init__.py 1.5 => 1.6 ===
--- CMF/CMFSetup/__init__.py:1.5 Thu Jul 1 19:14:23 2004
+++ CMF/CMFSetup/__init__.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
-""" CMFSetup product initialization
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
+""" CMFSetup product initialization.
$Id$
"""
+
from AccessControl import ModuleSecurityInfo
from permissions import ManagePortal
=== CMF/CMFSetup/actions.py 1.11 => 1.12 ===
--- CMF/CMFSetup/actions.py:1.11 Mon Jul 26 06:13:14 2004
+++ CMF/CMFSetup/actions.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Classes: ActionsProviderConfigurator
$Id$
"""
+
from xml.dom.minidom import parseString as domParseString
from AccessControl import ClassSecurityInfo
@@ -27,7 +40,7 @@
def importActionProviders( context ):
- """ Import action providers and their actions rom an XML file
+ """ Import action providers and their actions from an XML file.
o 'context' must implement IImportContext.
=== CMF/CMFSetup/context.py 1.13 => 1.14 ===
--- CMF/CMFSetup/context.py:1.13 Thu Aug 5 04:31:22 2004
+++ CMF/CMFSetup/context.py Fri Aug 6 04:20:06 2004
@@ -1,9 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Various context implementations for export / import of configurations.
Wrappers representing the state of an import / export operation.
$Id$
"""
+
import os
import time
from StringIO import StringIO
=== CMF/CMFSetup/differ.py 1.1 => 1.2 ===
--- CMF/CMFSetup/differ.py:1.1 Mon Jul 19 18:50:24 2004
+++ CMF/CMFSetup/differ.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Diff utilities for comparing configurations.
$Id$
"""
+
from difflib import unified_diff
import re
@@ -26,11 +39,11 @@
generated also consists of newline-terminated strings, ready
to be printed as-is via the writeline() method of a file-like
object.
-
+
Note that the last line of a file may *not* have a newline;
this is reported in the same way that GNU diff reports this.
*This method only supports UNIX line ending conventions.*
-
+
filename_a and filename_b are used to generate the header,
allowing other tools to determine what 'files' were used
to generate this output.
@@ -182,7 +195,7 @@
rhs_file = self._rhs.readDataFile( filename, subdir )
rhs_time = self._rhs.getLastModified( path )
-
+
if rhs_file is None:
assert self._missing_as_empty
rhs_file = ''
@@ -190,7 +203,7 @@
if lhs_file == rhs_file:
diff_lines = []
- else:
+ else:
diff_lines = unidiff( lhs_file
, rhs_file
, filename_a=path
=== CMF/CMFSetup/factory.py 1.1 => 1.2 ===
--- CMF/CMFSetup/factory.py:1.1 Thu Jul 1 19:14:23 2004
+++ CMF/CMFSetup/factory.py Fri Aug 6 04:20:06 2004
@@ -1,3 +1,15 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Configured site factory implementation.
$Id$
=== CMF/CMFSetup/interfaces.py 1.14 => 1.15 ===
--- CMF/CMFSetup/interfaces.py:1.14 Tue Jul 20 17:53:20 2004
+++ CMF/CMFSetup/interfaces.py Fri Aug 6 04:20:06 2004
@@ -1,3 +1,15 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" CMFSetup product interfaces
$Id$
@@ -176,7 +188,7 @@
def sortSteps():
""" Return a sequence of registered step IDs
-
+
o Sequence is sorted topologically by dependency, with the dependent
steps *after* the steps they depend on.
"""
@@ -208,7 +220,7 @@
be a yyyy/mm/dd-ii formatted string (date plus two-digit
ordinal). when comparing two version strings, the version with
the lower sort order is considered the older version.
-
+
- Newer versions of a step supplant older ones.
- Attempting to register an older one after a newer one results
@@ -409,7 +421,7 @@
def runImportStep( step_id, purge_old=True, run_dependencies=True ):
""" Execute a given setup step
-
+
o 'step_id' is the ID of the step to run.
o If 'purge_old' is True, then run the step after purging any
=== CMF/CMFSetup/permissions.py 1.1 => 1.2 ===
--- CMF/CMFSetup/permissions.py:1.1 Thu May 13 09:39:41 2004
+++ CMF/CMFSetup/permissions.py Fri Aug 6 04:20:06 2004
@@ -1,4 +1,16 @@
-""" CMFSetup product permissions
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
+""" CMFSetup product permissions.
$Id$
"""
=== CMF/CMFSetup/registry.py 1.16 => 1.17 ===
--- CMF/CMFSetup/registry.py:1.16 Thu Jul 1 19:14:23 2004
+++ CMF/CMFSetup/registry.py Fri Aug 6 04:20:06 2004
@@ -1,10 +1,21 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Classes: ImportStepRegistry, ExportStepRegistry
$Id$
"""
-import re
+
from xml.sax import parseString
-from xml.sax.handler import ContentHandler
from AccessControl import ClassSecurityInfo
from Acquisition import Implicit
@@ -49,7 +60,7 @@
def sortSteps( self ):
""" Return a sequence of registered step IDs
-
+
o Sequence is sorted topologically by dependency, with the dependent
steps *after* the steps they depend on.
"""
@@ -130,7 +141,7 @@
return default
return _resolveDottedName( info[ 'handler' ] )
-
+
security.declarePrivate( 'registerStep' )
def registerStep( self
, id
@@ -148,7 +159,7 @@
be a yyyy/mm/dd-ii formatted string (date plus two-digit
ordinal). when comparing two version strings, the version with
the lower sort order is considered the older version.
-
+
- Newer versions of a step supplant older ones.
- Attempting to register an older one after a newer one results
@@ -249,12 +260,12 @@
""" Registry of known site-configuration export steps.
o Each step is registered with a unique id.
-
+
o When called, with the portal object passed in as an argument,
the step must return a sequence of three-tuples,
( 'data', 'content_type', 'filename' ), one for each file exported
by the step.
-
+
- 'data' is a string containing the file data;
- 'content_type' is the MIME type of the data;
@@ -267,8 +278,8 @@
security = ClassSecurityInfo()
def __init__( self ):
-
- self._registered = {}
+
+ self._registered = {}
security.declareProtected( ManagePortal, 'listSteps' )
def listSteps( self ):
@@ -403,7 +414,7 @@
security = ClassSecurityInfo()
security.setDefaultAccess( 'allow' )
-
+
def __init__( self ):
self._clear()
@@ -525,7 +536,7 @@
security = ClassSecurityInfo()
security.setDefaultAccess( 'allow' )
-
+
def __init__( self ):
self._clear()
=== CMF/CMFSetup/skins.py 1.6 => 1.7 ===
--- CMF/CMFSetup/skins.py:1.6 Tue Jun 8 16:16:26 2004
+++ CMF/CMFSetup/skins.py Fri Aug 6 04:20:06 2004
@@ -1,10 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Skin path configuration management
Setup step and export script
$Id$
"""
-import os
+
import re
from xml.sax import parseString
@@ -46,7 +58,7 @@
)
o Register via XML:
-
+
<setup-step id="importSkinsTool"
version="20040524-01"
handler="Products.CMFSetup.skins.importSkinsTool"
@@ -119,7 +131,7 @@
)
o Register via XML:
-
+
<export-script id="exportSkinsTool"
version="20040518-01"
handler="Products.CMFSetup.skins.exportSkinsTool"
@@ -138,11 +150,11 @@
class SkinsToolConfigurator( Implicit ):
- security = ClassSecurityInfo()
+ security = ClassSecurityInfo()
security.setDefaultAccess('allow')
_COMMA_SPLITTER = re.compile( r',[ ]*' )
-
+
def __init__( self, site ):
self._site = site
=== CMF/CMFSetup/tool.py 1.16 => 1.17 ===
--- CMF/CMFSetup/tool.py:1.16 Tue Jul 20 12:13:52 2004
+++ CMF/CMFSetup/tool.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Classes: SetupTool
$Id$
"""
+
import os
import time
from cgi import escape
@@ -171,21 +184,21 @@
self._updateImportStepsRegistry( encoding )
self._updateExportStepsRegistry( encoding )
self._updateToolsetRegistry( encoding )
-
+
security.declareProtected( ManagePortal, 'getImportStepRegistry' )
def getImportStepRegistry( self ):
""" See ISetupTool.
"""
return self._import_registry
-
+
security.declareProtected( ManagePortal, 'getImportStepRegistry' )
def getExportStepRegistry( self ):
""" See ISetupTool.
"""
return self._export_registry
-
+
security.declareProtected( ManagePortal, 'getToolsetRegistry' )
def getToolsetRegistry( self ):
@@ -281,7 +294,7 @@
}
security.declareProtected(ManagePortal, 'compareConfigurations')
- def compareConfigurations( self
+ def compareConfigurations( self
, lhs_context
, rhs_context
, missing_as_empty=False
@@ -479,7 +492,7 @@
def listSnapshotInfo( self ):
""" Return a list of mappings describing available snapshots.
-
+
o Keys include:
'id' -- snapshot ID
@@ -505,7 +518,7 @@
def listProfileInfo( self ):
""" Return a list of mappings describing registered profiles.
-
+
o Keys include:
'id' -- profile ID
@@ -610,7 +623,7 @@
path = info[ 'path' ]
return DirectoryImportContext( self, path )
-
+
# else snapshot
context_id = context_id[ len( 'snapshot-' ): ]
return SnapshotImportContext( self, context_id )
=== CMF/CMFSetup/typeinfo.py 1.10 => 1.11 ===
--- CMF/CMFSetup/typeinfo.py:1.10 Mon Jul 19 16:08:36 2004
+++ CMF/CMFSetup/typeinfo.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" Types tool export / import
$Id$
"""
+
from xml.dom.minidom import parseString as domParseString
from xml.sax import parseString
=== CMF/CMFSetup/utils.py 1.11 => 1.12 ===
--- CMF/CMFSetup/utils.py:1.11 Mon Jul 19 16:08:36 2004
+++ CMF/CMFSetup/utils.py Fri Aug 6 04:20:06 2004
@@ -1,7 +1,20 @@
+##############################################################################
+#
+# Copyright (c) 2004 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
+#
+##############################################################################
""" CMFSetup product utilities
$Id$
"""
+
import os
from inspect import getdoc
from xml.sax.handler import ContentHandler
More information about the CMF-checkins
mailing list