Get rid of $Revision$ in a few prominant places. Use an $Id$ in the

docstring instead, as the new style suggests.

lib/python/AccessControl/DTML.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-'''Add security system support to Document Templates
-
-$Id$'''
-__version__='$Revision: 1.13 $'[11:-2]
+"""Add security system support to Document Templates
 
+$Id$
+"""
 from DocumentTemplate import DT_Util
 import SecurityManagement, string, math, whrandom, random
 import DocumentTemplate.sequence

lib/python/AccessControl/Permission.py

@@ -10,12 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''short description
-
-
-$Id$'''
-__version__='$Revision: 1.10 $'[11:-2]
+"""Permissions
 
+$Id$
+"""
 import string, Products, Globals
 
 ListType=type([])

lib/python/AccessControl/Role.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Access control support"""
-
-__version__='$Revision: 1.61 $'[11:-2]
-
+"""Access control support
 
+$Id$
+"""
 from Globals import DTMLFile, MessageDialog, Dictionary
 from Acquisition import Implicit, Acquired, aq_get
 import Globals, ExtensionClass, PermissionMapping, Products

lib/python/AccessControl/SecurityManagement.py

@@ -10,12 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''short description
-
-
-$Id$'''
-__version__='$Revision: 1.10 $'[11:-2]
+"""Security management
 
+$Id$
+"""
 def getSecurityManager():
     """Get a security manager, for the current thread.
     """

lib/python/AccessControl/SpecialUsers.py

@@ -18,8 +18,6 @@ initialization.
 
 $Id$
 """
-__version__='$Revision: 1.5 $'[11:-2]
-
 nobody = None
 system = None
 emergency_user = None

lib/python/OFS/Application.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Application support
-
-$Id$'''
-__version__='$Revision: 1.202 $'[11:-2]
+"""Application support
 
+$Id$
+"""
 import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_
 import time, traceback, os,  Products
 from DateTime import DateTime

lib/python/OFS/Cache.py

@@ -10,12 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Cacheable object and cache management base classes.
-
-$Id$"""
-
-__version__='$Revision: 1.12 $'[11:-2]
+"""Cacheable object and cache management base classes.
 
+$Id$
+"""
 import time, sys
 import Globals
 from Globals import DTMLFile

lib/python/OFS/CopySupport.py

@@ -10,9 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Copy interface"""
-__version__='$Revision: 1.91 $'[11:-2]
+"""Copy interface
 
+$Id$
+"""
 import sys,  Globals, Moniker, tempfile, ExtensionClass
 from marshal import loads, dumps
 from urllib import quote, unquote

lib/python/OFS/DTMLDocument.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""DTML Document objects."""
-
-__version__='$Revision: 1.51 $'[11:-2]
+"""DTML Document objects.
 
+$Id$
+"""
 from ZPublisher.Converters import type_converters
 from Globals import HTML, DTMLFile, MessageDialog
 from OFS.content_types import guess_content_type

lib/python/OFS/DTMLMethod.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""DTML Method objects."""
-
-__version__='$Revision: 1.85 $'[11:-2]
+"""DTML Method objects.
 
+$Id$
+"""
 import History
 from Globals import HTML, DTMLFile, MessageDialog
 from SimpleItem import Item_w__name__, pretty_tb

lib/python/OFS/DefaultObservable.py

@@ -10,15 +10,13 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Implement Observable interface (see
+"""Implement Observable interface (see
 http://www.zope.org/Members/michel/Projects/Interfaces/ObserverAndNotification)
-This class is intended to be used as a mixin (note that it doesn't derive
-from any Zope persistence classes, for instance).
-
-$Id$"""
-
-__version__='$Revision: 1.7 $'[11:-2]
+This class is intended to be used as a mixin (note that it doesn't
+derive from any Zope persistence classes, for instance).
 
+$Id$
+"""
 from types import StringType
 
 class DefaultObservable:

lib/python/OFS/Document.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Deprecated - use DTMLMethod"""
-
-__version__='$Revision: 1.76 $'[11:-2]
+"""Deprecated - use DTMLMethod
 
+$Id$
+"""
 import DTMLMethod
 
 Document=DTMLMethod.DTMLMethod

lib/python/OFS/FindSupport.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Find support"""
-__version__='$Revision: 1.33 $'[11:-2]
-
+"""Find support
 
+$Id$
+"""
 import sys, os, time, Globals, ExtensionClass
 from DocumentTemplate.DT_Util import Eval
 from AccessControl.Permission import name_trans

lib/python/OFS/Folder.py

@@ -10,15 +10,12 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-
 """Folder object
 
 Folders are the basic container objects and are analogous to directories.
 
-$Id$"""
-
-__version__='$Revision: 1.104 $'[11:-2]
-
+$Id$
+"""
 import Globals, SimpleItem, ObjectManager, PropertyManager
 import AccessControl.Role, webdav.Collection, FindSupport
 from webdav.WriteLockInterface import WriteLockInterface

lib/python/OFS/History.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Object Histories"""
-
-__version__='$Revision: 1.18 $'[11:-2]
+"""Object Histories
 
+$Id$
+"""
 import Globals, ExtensionClass, difflib
 from DateTime import DateTime
 from Acquisition import Implicit, aq_base

lib/python/OFS/Image.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Image object"""
-
-__version__='$Revision: 1.152 $'[11:-2]
+"""Image object
 
+$Id$
+"""
 import Globals, struct
 from OFS.content_types import guess_content_type
 from Globals import DTMLFile

lib/python/OFS/Moniker.py

@@ -17,10 +17,8 @@
    a real object that retains its correct version context
    and aquisition relationships via a simple interface.
 
+$Id$
 """
-__version__='$Revision: 1.16 $'[11:-2]
-
-
 import Globals
 
 class Moniker:

lib/python/OFS/ObjectManager.py

@@ -10,12 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__="""Object Manager
-
-$Id$"""
-
-__version__='$Revision: 1.175 $'[11:-2]
+"""Object Manager
 
+$Id$
+"""
 import App.Management, Acquisition, Globals, CopySupport, Products
 import os, App.FactoryDispatcher, re, Products
 from OFS.Traversable import Traversable

lib/python/OFS/PropertyManager.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+"""Property management
 
-"""Property management"""
-__version__='$Revision: 1.56 $'[11:-2]
-
+$Id$
+"""
 import ExtensionClass, Globals
 import ZDOM
 from PropertySheets import DefaultPropertySheets, vps

lib/python/OFS/PropertySheets.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+"""Property sheets
 
-"""Property sheets"""
-
-__version__='$Revision: 1.95 $'[11:-2]
-
+$Id$
+"""
 import time,  App.Management, Globals, sys
 from webdav.WriteLockInterface import WriteLockInterface
 from ZPublisher.Converters import type_converters

lib/python/OFS/SimpleItem.py

@@ -10,16 +10,15 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-'''This module implements a simple item mix-in for objects that have a
+"""This module implements a simple item mix-in for objects that have a
 very simple (e.g. one-screen) management interface, like documents,
 Aqueduct database adapters, etc.
 
 This module can also be used as a simple template for implementing new
 item types.
 
-$Id$'''
-__version__='$Revision: 1.110 $'[11:-2]
-
+$Id$
+"""
 import re, sys, Globals, App.Management, Acquisition, App.Undo
 import AccessControl.Role, AccessControl.Owned, App.Common
 from webdav.Resource import Resource

lib/python/OFS/Traversable.py

@@ -10,12 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-'''This module implements a mix-in for traversable objects.
-
-$Id$'''
-__version__='$Revision: 1.24 $'[11:-2]
-
+"""This module implements a mix-in for traversable objects.
 
+$Id$
+"""
 from Acquisition import Acquired, aq_inner, aq_parent, aq_base
 from AccessControl import getSecurityManager
 from AccessControl import Unauthorized

lib/python/OFS/content_types.py

@@ -10,9 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""A utility module for content-type handling."""
-__version__='$Revision: 1.20 $'[11:-2]
+"""A utility module for content-type handling.
 
+$Id$
+"""
 import mimetypes
 import os.path
 import re

lib/python/OFS/rPickle.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""Restricted unpickler"""
-
-__version__='$Revision: 1.7 $'[11:-2]
-
+"""Restricted unpickler
 
+$Id$
+"""
 import pickle
 
 reg={}

lib/python/ZTUtils/Batch.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Batch class, for iterating over a sequence in batches
-
-$Id$'''
-__version__='$Revision: 1.10 $'[11:-2]
+"""Batch class, for iterating over a sequence in batches
 
+$Id$
+"""
 from ExtensionClass import Base
 
 class LazyPrevBatch(Base):

lib/python/ZTUtils/Iterator.py

@@ -10,7 +10,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Iterator class
+"""Iterator class
 
 Unlike the builtin iterators of Python 2.2+, these classes are
 designed to maintain information about the state of an iteration.
@@ -18,8 +18,8 @@ The Iterator() function accepts either a sequence or a Python
 iterator.  The next() method fetches the next item, and returns
 true if it succeeds.
 
-$Id$'''
-__version__='$Revision: 1.11 $'[11:-2]
+$Id$
+"""
 
 class Iterator:
     '''Simple Iterator class'''

lib/python/ZTUtils/SimpleTree.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Simple Tree classes
-
-$Id$'''
-__version__='$Revision: 1.5 $'[11:-2]
+"""Simple Tree classes
 
+$Id$
+"""
 from Tree import TreeMaker, TreeNode, b2a
 from cgi import escape
 

lib/python/ZTUtils/Tree.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Tree manipulation classes
-
-$Id$'''
-__version__='$Revision: 1.19 $'[11:-2]
+"""Tree manipulation classes
 
+$Id$
+"""
 from Acquisition import Explicit
 from ComputedAttribute import ComputedAttribute
 from types import ListType, TupleType

lib/python/ZTUtils/Zope.py

@@ -10,11 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Zope-specific versions of ZTUTils classes
-
-$Id$'''
-__version__='$Revision: 1.15 $'[11:-2]
+"""Zope-specific versions of ZTUTils classes
 
+$Id$
+"""
 import sys, cgi, urllib, cgi
 from Tree import encodeExpansion, decodeExpansion, TreeMaker
 from SimpleTree import SimpleTreeMaker

lib/python/ZTUtils/__init__.py

@@ -10,10 +10,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''Package of template utility classes and functions.
+"""Package of template utility classes and functions.
 
-$Id$'''
-__version__='$Revision: 1.6 $'[11:-2]
+$Id$
+"""
 
 from Batch import Batch
 from Iterator import Iterator

utilities/check_catalog.py

 #!/usr/bin/env python2.3
-
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
@@ -12,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+"""Script to check consistency of a ZCatalog
 
-""" script to consistency of a ZCatalog """
-
-__version__='$Revision: 1.6 $'[11:-2]
-
+$Id$
+"""
 import Zope
 import os,sys,re,getopt
 from types import IntType

utilities/requestprofiler.py

 #!/usr/bin/env python2.3
-
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
@@ -12,11 +11,10 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
+"""Request log profiler script
 
-""" Request log profiler script """
-
-__version__='$Revision: 1.19 $'[11:-2]
-
+$Id$
+"""
 import sys, time, getopt, math, cPickle
 from types import StringType
 try: import gzip

utilities/zpasswd.py

@@ -39,9 +39,6 @@ for all necessary information.  The available options are:
     Filename is required and should be the name of the file to store the
     information in (usually "inituser" or "access").
 """
-
-__version__='$Revision: 1.5 $ '[11:-2]
-
 import sys,  sha, binascii, random, getopt, getpass, os
 
 try: