[CMF-checkins] CVS: CMF/CMFDefault - DiscussionTool.py:1.10 Document.py:1.49 Favorite.py:1.17 Link.py:1.22 Portal.py:1.32 PropertiesTool.py:1.7 URLTool.py:1.11

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv13736/CMFDefault

Modified Files:
	DiscussionTool.py Document.py Favorite.py Link.py Portal.py 
	PropertiesTool.py URLTool.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/CMFDefault/DiscussionTool.py 1.9 => 1.10 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Basic portal discussion access tool.
 
-"""Basic portal discussion access tool.
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
 
 from Globals import InitializeClass, DTMLFile
 from AccessControl import ClassSecurityInfo


=== CMF/CMFDefault/Document.py 1.48 => 1.49 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-__version__ = "$Revision$"[11:-2]
+""" Basic textual content object, supporting both HTML and STX.
+
+$Id$
+"""
 
 ADD_CONTENT_PERMISSION = 'Add portal content'
 


=== CMF/CMFDefault/Favorite.py 1.16 => 1.17 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""
-    Favorites represent references to other objects within the same
-    CMF site..
+""" Favorites are references to other objects within the same CMF site..
 
 $Id$
 """
-__version__ = "$Revision$"[11:-2]
 
 import Globals
 from Globals import HTMLFile, HTML


=== CMF/CMFDefault/Link.py 1.21 => 1.22 ===
 
 $Id$
 """
-__version__ = "$Revision$"[11:-2]
 
 import string
 import urlparse


=== CMF/CMFDefault/Portal.py 1.31 => 1.32 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
+""" Portal class
 
-"""Portal class
 $Id$
 """
-__version__='$Revision$'[11:-2]
  
 import Globals
 from Products.CMFCore.PortalObject import PortalObjectBase


=== CMF/CMFDefault/PropertiesTool.py 1.6 => 1.7 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-
-"""CMFDefault portal_properties tool.
+""" CMFDefault portal_properties tool.
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 
 from Products.CMFCore.utils import UniqueObject


=== CMF/CMFDefault/URLTool.py 1.10 => 1.11 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-
-"""CMFDefault portal_url tool.
+""" CMFDefault portal_url tool.
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 
 from Products.CMFCore.utils import UniqueObject