Clean up indentation and trailing whitespace.

As the 'if 1:' block for diff preservation was heavily tabbed anyway, I
removed an indent level and the 'if 1:' statement.

lib/python/OFS/Application.py

@@ -12,8 +12,8 @@
 ##############################################################################
 __doc__='''Application support
 
-$Id: Application.py,v 1.186 2002/08/09 14:51:53 chrism Exp $'''
-__version__='$Revision: 1.186 $'[11:-2]
+$Id: Application.py,v 1.187 2002/08/14 21:42:55 mj Exp $'''
+__version__='$Revision: 1.187 $'[11:-2]
 
 import Globals,Folder,os,sys,App.Product, App.ProductRegistry, misc_
 import time, traceback, os,  Products
@@ -528,7 +528,6 @@ def import_product(product_dir, product_name, raise_exc=0, log_exc=1):
     modules=sys.modules
     have_module=modules.has_key
 
-    if 1:  # Preserve indentation for diff :-)
     try:
         package_dir=path_join(product_dir, product_name)
         if not isdir(package_dir): return

lib/python/OFS/Cache.py

@@ -12,9 +12,9 @@
 ##############################################################################
 __doc__="""Cacheable object and cache management base classes.
 
-$Id: Cache.py,v 1.9 2002/02/07 17:20:59 andreasjung Exp $"""
+$Id: Cache.py,v 1.10 2002/08/14 21:42:56 mj Exp $"""
 
-__version__='$Revision: 1.9 $'[11:-2]
+__version__='$Revision: 1.10 $'[11:-2]
 
 import time, sys
 import Globals

lib/python/OFS/CopySupport.py

@@ -11,7 +11,7 @@
 #
 ##############################################################################
 __doc__="""Copy interface"""
-__version__='$Revision: 1.81 $'[11:-2]
+__version__='$Revision: 1.82 $'[11:-2]
 
 import sys,  Globals, Moniker, tempfile, ExtensionClass
 from marshal import loads, dumps

lib/python/OFS/DTMLDocument.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.47 $'[11:-2]
+__version__='$Revision: 1.48 $'[11:-2]
 
 from ZPublisher.Converters import type_converters
 from Globals import HTML, DTMLFile, MessageDialog
@@ -178,5 +178,3 @@ def addDTMLDocument(self, id, title='', file='', REQUEST=None, submit=None):
         if submit==" Add and Edit ": u="%s/%s" % (u,quote(id))
         REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
-
-

lib/python/OFS/DTMLMethod.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """DTML Method objects."""
 
-__version__='$Revision: 1.78 $'[11:-2]
+__version__='$Revision: 1.79 $'[11:-2]
 
 import History
 from Globals import HTML, DTMLFile, MessageDialog
@@ -411,4 +411,3 @@ def addDTMLMethod(self, id, title='', file='', REQUEST=None, submit=None):
         if submit==" Add and Edit ": u="%s/%s" % (u,quote(id))
         REQUEST.RESPONSE.redirect(u+'/manage_main')
     return ''
-

lib/python/OFS/DefaultObservable.py

@@ -15,9 +15,9 @@ 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: DefaultObservable.py,v 1.5 2002/02/07 17:20:59 andreasjung Exp $"""
+$Id: DefaultObservable.py,v 1.6 2002/08/14 21:42:56 mj Exp $"""
 
-__version__='$Revision: 1.5 $'[11:-2]
+__version__='$Revision: 1.6 $'[11:-2]
 
 from types import StringType
 
@@ -204,4 +204,3 @@ if __name__ == '__main__':
         print '[%s]' % key
         for cb in callbacks[ key ]:
             print '    %s' % `cb`
-

lib/python/OFS/Document.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Deprecated - use DTMLMethod"""
 
-__version__='$Revision: 1.75 $'[11:-2]
+__version__='$Revision: 1.76 $'[11:-2]
 
 import DTMLMethod
 

lib/python/OFS/FindSupport.py

@@ -11,7 +11,7 @@
 #
 ##############################################################################
 __doc__="""Find support"""
-__version__='$Revision: 1.30 $'[11:-2]
+__version__='$Revision: 1.31 $'[11:-2]
 
 
 import sys, os, time, Globals, ExtensionClass
@@ -307,5 +307,3 @@ def absattr(attr):
 
 def p_name(name):
     return '_' + translate(name, name_trans) + '_Permission'
-
-

lib/python/OFS/Folder.py

@@ -15,9 +15,9 @@
 
 Folders are the basic container objects and are analogous to directories.
 
-$Id: Folder.py,v 1.100 2002/06/07 18:10:31 caseman Exp $"""
+$Id: Folder.py,v 1.101 2002/08/14 21:42:56 mj Exp $"""
 
-__version__='$Revision: 1.100 $'[11:-2]
+__version__='$Revision: 1.101 $'[11:-2]
 
 import Globals, SimpleItem, ObjectManager, PropertyManager
 import AccessControl.Role, webdav.Collection, FindSupport

lib/python/OFS/History.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Object Histories"""
 
-__version__='$Revision: 1.13 $'[11:-2]
+__version__='$Revision: 1.14 $'[11:-2]
 
 import Globals, ExtensionClass, difflib
 from DateTime import DateTime

lib/python/OFS/Image.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Image object"""
 
-__version__='$Revision: 1.139 $'[11:-2]
+__version__='$Revision: 1.140 $'[11:-2]
 
 import Globals, struct
 from OFS.content_types import guess_content_type
@@ -802,12 +802,3 @@ class Pdata(Persistent, Implicit):
             next=self.next
 
         return ''.join(r)
-
-
-
-
-
-
-
-
-

lib/python/OFS/Moniker.py

@@ -18,7 +18,7 @@
    and aquisition relationships via a simple interface.
 
 """
-__version__='$Revision: 1.15 $'[11:-2]
+__version__='$Revision: 1.16 $'[11:-2]
 
 
 import Globals

lib/python/OFS/ObjectManager.py

@@ -12,9 +12,9 @@
 ##############################################################################
 __doc__="""Object Manager
 
-$Id: ObjectManager.py,v 1.157 2002/08/14 19:59:18 mj Exp $"""
+$Id: ObjectManager.py,v 1.158 2002/08/14 21:42:56 mj Exp $"""
 
-__version__='$Revision: 1.157 $'[11:-2]
+__version__='$Revision: 1.158 $'[11:-2]
 
 import App.Management, Acquisition, Globals, CopySupport, Products
 import os, App.FactoryDispatcher, re, Products

lib/python/OFS/PropertyManager.py

@@ -12,7 +12,7 @@
 ##############################################################################
 
 """Property management"""
-__version__='$Revision: 1.45 $'[11:-2]
+__version__='$Revision: 1.46 $'[11:-2]
 
 import ExtensionClass, Globals
 import ZDOM

lib/python/OFS/PropertySheets.py

@@ -13,7 +13,7 @@
 
 """Property sheets"""
 
-__version__='$Revision: 1.86 $'[11:-2]
+__version__='$Revision: 1.87 $'[11:-2]
 
 import time,  App.Management, Globals
 from webdav.WriteLockInterface import WriteLockInterface

lib/python/OFS/SimpleItem.py

@@ -17,8 +17,8 @@ Aqueduct database adapters, etc.
 This module can also be used as a simple template for implementing new
 item types.
 
-$Id: SimpleItem.py,v 1.101 2002/06/25 20:52:56 caseman Exp $'''
-__version__='$Revision: 1.101 $'[11:-2]
+$Id: SimpleItem.py,v 1.102 2002/08/14 21:42:56 mj Exp $'''
+__version__='$Revision: 1.102 $'[11:-2]
 
 import re, sys, Globals, App.Management, Acquisition, App.Undo
 import AccessControl.Role, AccessControl.Owned, App.Common
@@ -385,4 +385,3 @@ class SimpleItem(Item, Globals.Persistent,
             res += ' used for %s' % context_path
         res += '>'
         return res
-

lib/python/OFS/Traversable.py

@@ -12,8 +12,8 @@
 ##############################################################################
 '''This module implements a mix-in for traversable objects.
 
-$Id: Traversable.py,v 1.14 2002/02/07 17:20:59 andreasjung Exp $'''
-__version__='$Revision: 1.14 $'[11:-2]
+$Id: Traversable.py,v 1.15 2002/08/14 21:42:56 mj Exp $'''
+__version__='$Revision: 1.15 $'[11:-2]
 
 
 from Acquisition import Acquired, aq_inner, aq_parent, aq_base

lib/python/OFS/XMLExportImport.py

@@ -117,4 +117,3 @@ def importXML(jar, file, clue=''):
     r=p.Parse(data)
     outfile.seek(0)
     return jar.importFile(outfile,clue)
-        

lib/python/OFS/ZDOM.py

@@ -550,5 +550,3 @@ class Attr(Acquisition.Implicit, Node):
         """If this attribute was explicitly given a value in the
         original document, this is true; otherwise, it is false."""
         return self.specified
-        
-        

lib/python/OFS/content_types.py

@@ -11,7 +11,7 @@
 #
 ##############################################################################
 """A utility module for content-type handling."""
-__version__='$Revision: 1.17 $'[11:-2]
+__version__='$Revision: 1.18 $'[11:-2]
 
 import re, mimetypes
 
@@ -97,4 +97,3 @@ if __name__=='__main__':
     items=mimetypes.types_map.items()
     items.sort()
     for item in items: print "%s:\t%s" % item
-

lib/python/OFS/rPickle.py

@@ -12,7 +12,7 @@
 ##############################################################################
 """Restricted unpickler"""
 
-__version__='$Revision: 1.5 $'[11:-2]
+__version__='$Revision: 1.6 $'[11:-2]
 
 
 import pickle
@@ -42,5 +42,3 @@ def register(mod, cls, obj):
 def unregister(mod, cls):
     """Unregister a class"""
     del reg[(mod,cls)]
-
-