[CMF-checkins] CVS: CMF/CMFTopic - AbstractCriterion.py:1.6 DateCriteria.py:1.6 ListCriterion.py:1.11 SimpleIntCriterion.py:1.9 SimpleStringCriterion.py:1.9 SortCriterion.py:1.5 Topic.py:1.30 TopicPermissions.py:1.5 __init__.py:1.13

[Tres Seaver]

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

Modified Files:
	AbstractCriterion.py DateCriteria.py ListCriterion.py 
	SimpleIntCriterion.py SimpleStringCriterion.py 
	SortCriterion.py Topic.py TopicPermissions.py __init__.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/CMFTopic/AbstractCriterion.py 1.5 => 1.6 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Home of the abstract Criterion base class.
+""" Home of the abstract Criterion base class.
 
 $Id$
 """
-__version__ = '$Revision$'[11:-2]
 
 from Products.CMFTopic.TopicPermissions import ChangeTopics
 


=== CMF/CMFTopic/DateCriteria.py 1.5 => 1.6 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Various date criteria
+""" Various date criteria
 
 $Id$
 """
-__version__ = '$Revision$'[11:-2]
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion
 from Products.CMFTopic.interfaces import Criterion


=== CMF/CMFTopic/ListCriterion.py 1.10 => 1.11 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""List Criterion: A criterion that is a list
+""" List Criterion: A criterion that is a list
 
 $Id$
 """
-__version__ = '$Revision$'[11:-2]
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion
 from Products.CMFTopic.interfaces import Criterion


=== CMF/CMFTopic/SimpleIntCriterion.py 1.8 => 1.9 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Simple int-matching criterion
+""" Simple int-matching criterion
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from Products.CMFTopic import TopicPermissions
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion


=== CMF/CMFTopic/SimpleStringCriterion.py 1.8 => 1.9 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Simple string-matching criterion class
+""" Simple string-matching criterion class
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from Products.CMFTopic import TopicPermissions
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion


=== CMF/CMFTopic/SortCriterion.py 1.4 => 1.5 ===
 
 $Id$
 """
-__version__ = '$Revision$'[11:-2]
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion
 from Products.CMFTopic.Topic import Topic


=== CMF/CMFTopic/Topic.py 1.29 => 1.30 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Topic: Canned catalog queries
+""" Topic: Canned catalog queries
 
 $Id$
 """
-__version__ = '$Revision$'[11:-2]
 
 from Products.CMFTopic import TopicPermissions
 


=== CMF/CMFTopic/TopicPermissions.py 1.4 => 1.5 ===
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""TopicPermissions: Permissions used throughout CMFTopic.
+""" TopicPermissions: Permissions used throughout CMFTopic.
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
 
 from Products.CMFCore.CMFCorePermissions import setDefaultRoles
 


=== CMF/CMFTopic/__init__.py 1.12 => 1.13 ===
 # FOR A PARTICULAR PURPOSE
 # 
 ##############################################################################
-"""Topic: Canned catalog queries
+""" Topic: Canned catalog queries
 
 $Id$
 """
-__version__='$Revision$'[11:-2]
-
  
 import TopicPermissions
 import Topic