Thu, 1 Aug 2002 15:08:26 -0400

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv15668/CMFCore

Modified Files:
      Tag: CMF-1_3-branch
	ActionsTool.py CMFCorePermissions.py CatalogTool.py 
	ContentTypeRegistry.py CookieCrumbler.py DirectoryView.py 
	DiscussionTool.py DynamicType.py Expression.py FSDTMLMethod.py 
	FSImage.py FSObject.py FSPageTemplate.py FSPropertiesObject.py 
	FSPythonScript.py FSZSQLMethod.py MemberDataTool.py 
	MembershipTool.py PortalContent.py PortalFolder.py 
	PortalObject.py Skinnable.py SkinsContainer.py SkinsTool.py 
	TypesTool.py UndoTool.py __init__.py register.py 
Log Message:


  - Normalize module headers:

    o Eradicate __version__, which tended to be a merge hotspot, in favor
      of embedding $Id$ in the docstring (which somehow seems not to cause
      nearly so many conflicts).

    o Use triple-quotes, rather than triple-apostrophes, for module
      docstrings;  canonicalize format:  single, summary line, followed
      by optional narrative, followed by $Id$;  each section separated
      by a blank line.


=== CMF/CMFCore/ActionsTool.py 1.27.10.2 => 1.27.10.3 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-
-"""Basic action list tool.
+""" Basic action list tool.
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 import OFS
 from utils import UniqueObject, SimpleItemWithProperties, _getAuthenticatedUser, _checkPermission


=== CMF/CMFCore/CMFCorePermissions.py 1.10 => 1.10.36.1 ===
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+""" Declare named permissions used throughout the CMF.
 
-"""Declare named permissions used throughout the CMF.
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 import Globals, AccessControl, Products
 from AccessControl import Permissions


=== CMF/CMFCore/CatalogTool.py 1.30.4.5 => 1.30.4.6 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic portal catalog.
 
-"""Basic portal catalog.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 import os
 from utils import UniqueObject, _checkPermission, _getAuthenticatedUser


=== CMF/CMFCore/ContentTypeRegistry.py 1.9 => 1.9.4.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic Site content type registry
 
-"""
-Basic Site content type registry
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from OFS.SimpleItem import SimpleItem, Item
 from AccessControl import ClassSecurityInfo


=== CMF/CMFCore/CookieCrumbler.py 1.12.36.1 => 1.12.36.2 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Cookie Crumbler: Enable cookies for non-cookie user folders.
 
-"""Cookie Crumbler: Enable cookies for non-cookie user folders.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 from base64 import encodestring
 from urllib import quote, unquote


=== CMF/CMFCore/DirectoryView.py 1.23 => 1.23.6.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Views of filesystem directories as folders."""
+""" Views of filesystem directories as folders.
 
-__version__='$Revision$'[11:-2]
+$Id$
+"""
 
 import Globals
 from Globals import HTMLFile, Persistent, package_home, DTMLFile


=== CMF/CMFCore/DiscussionTool.py 1.6 => 1.6.16.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic portal discussion access tool.
 
-"""Basic portal discussion access tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 from utils import UniqueObject, getToolByName
 from utils import getToolByName, _dtmldir


=== CMF/CMFCore/DynamicType.py 1.11 => 1.11.4.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" DynamicType: Mixin for dynamic properties.
 
-"""DynamicType: Mixin for dynamic properties.
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from AccessControl import ClassSecurityInfo
 from utils import getToolByName


=== CMF/CMFCore/Expression.py 1.4 => 1.4.10.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-'''
-Expressions in a web-configurable workflow.
+""" Expressions in a web-configurable workflow.
+
 $Id$
-'''
-__version__='$Revision$'[11:-2]
+"""
 
 import Globals
 from Globals import Persistent


=== CMF/CMFCore/FSDTMLMethod.py 1.9 => 1.9.36.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Customizable DTML methods that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" Customizable DTML methods that come from the filesystem.
+
+$Id$
+"""
 
 from string import split
 from os import path, stat


=== CMF/CMFCore/FSImage.py 1.11 => 1.11.8.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Customizable image objects that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" Customizable image objects that come from the filesystem.
+
+$Id$
+"""
 
 import string, os
 

=== CMF/CMFCore/FSObject.py 1.9 => 1.9.10.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Customizable objects that come from the filesystem (base class)."""
-__version__='$Revision$'[11:-2]
+""" Customizable objects that come from the filesystem (base class).
+
+$Id$
+"""
 
 from string import split
 from os import path, stat


=== CMF/CMFCore/FSPageTemplate.py 1.8.8.2 => 1.8.8.3 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##########################################################################
-"""Customizable page templates that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" Customizable page templates that come from the filesystem.
+
+$Id$
+"""
 
 from string import split, replace
 from os import stat


=== CMF/CMFCore/FSPropertiesObject.py 1.8.16.3 => 1.8.16.4 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Customizable properties that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" Customizable properties that come from the filesystem.
+
+$Id$
+"""
 
 from string import split, strip
 

=== CMF/CMFCore/FSPythonScript.py 1.16 => 1.16.10.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Customizable Python scripts that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" Customizable Python scripts that come from the filesystem.
+
+$Id$
+"""
 
 from string import strip, split
 from os import path, stat


=== CMF/CMFCore/FSZSQLMethod.py 1.2 => 1.2.36.1 ===
 #
 # $Id$
 
-"""(not yet)Customizable ZSQL methods that come from the filesystem."""
-__version__='$Revision$'[11:-2]
+""" (not yet)Customizable ZSQL methods that come from the filesystem.
+
+$Id$
+"""
 
 import Globals
 from AccessControl import ClassSecurityInfo


=== CMF/CMFCore/MemberDataTool.py 1.15.8.1 => 1.15.8.2 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic member data tool.
 
-"""Basic member data tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 import string
 from utils import UniqueObject, getToolByName, _dtmldir


=== CMF/CMFCore/MembershipTool.py 1.23.4.3 => 1.23.4.4 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic membership tool.
 
-"""Basic membership tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from string import find
 from utils import UniqueObject, _getAuthenticatedUser, _checkPermission


=== CMF/CMFCore/PortalContent.py 1.34.10.2 => 1.34.10.3 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""PortalContent: Base class for all CMF content.
+""" PortalContent: Base class for all CMF content.
+
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 import string, urllib
 

=== CMF/CMFCore/PortalFolder.py 1.37.4.3 => 1.37.4.4 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""PortalFolder: CMF-enabled Folder objects.
+""" PortalFolder: CMF-enabled Folder objects.
+
 $Id$
 """
-
-__version__='$Revision$'[11:-2]
 
 ADD_FOLDERS_PERMISSION = 'Add portal folders'
 ADD_CONTENT_PERMISSION = 'Add portal content'


=== CMF/CMFCore/PortalObject.py 1.3 => 1.3.38.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" PortalObject: The portal root object class
 
-"""PortalObject: The portal root object class
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from Globals import default__class_init__
 from PortalFolder import PortalFolder


=== CMF/CMFCore/Skinnable.py 1.4.4.1 => 1.4.4.2 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-'''
+""" Base class for object managers which can be "skinned".
+
 Skinnable object managers inherit attributes from a skin specified in
 the browser request.  Skins are stored in a fixed-name subobject.
-$Id$
-'''
 
-__version__='$Revision$'[11:-2]
+$Id$
+"""
 
 import Globals
 from OFS.ObjectManager import ObjectManager


=== CMF/CMFCore/SkinsContainer.py 1.4 => 1.4.36.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Base class for objects that supply skins.
 
-"""Base class for objects that supply skins.
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from string import split, join, strip
 from Acquisition import aq_base


=== CMF/CMFCore/SkinsTool.py 1.15 => 1.15.4.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Portal skins tool.
 
-"""Portal skins tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 from string import split
 from utils import UniqueObject, getToolByName, _dtmldir


=== CMF/CMFCore/TypesTool.py 1.37.4.3 => 1.37.4.4 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Type registration tool.
 
+$Id$
 """
-    Type registration tool.
-    $Id$
-"""
-__version__='$Revision$'[11:-2]
 
 import OFS
 from Globals import InitializeClass, DTMLFile


=== CMF/CMFCore/UndoTool.py 1.6.8.1 => 1.6.8.2 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic undo tool.
 
-"""Basic undo tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 from utils import UniqueObject, _getAuthenticatedUser, _checkPermission
 from utils import getToolByName, _dtmldir


=== CMF/CMFCore/__init__.py 1.15.8.1 => 1.15.8.2 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Portal services base objects"""
-__version__='$Revision$'[11:-2]
+""" Portal services base objects
+
+$Id$
+"""
 
 import PortalObject, PortalContent, PortalFolder
 import MembershipTool, WorkflowTool, CatalogTool, DiscussionTool


=== CMF/CMFCore/register.py 1.4 => 1.4.36.1 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""register: register portal content types with the CMF.
+""" register: register portal content types with the CMF.
+
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 import urllib
 import OFS, Globals