[CMF-checkins] CVS: CMF/CMFDefault/Extensions - Upgrade.py:1.2.44.1 migrate_ptk.py:1.1.74.1 update_catalogIndexes.py:1.4.40.1 update_discussion.py:1.1.74.1

[Sidnei da Silva]

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

Modified Files:
      Tag: CMF-1_4-branch
	Upgrade.py migrate_ptk.py update_catalogIndexes.py 
	update_discussion.py 
Log Message:
Fix version.txt to right version. Run reindent.py for removing extra tabs and whitespaces


=== CMF/CMFDefault/Extensions/Upgrade.py 1.2 => 1.2.44.1 ===
--- CMF/CMFDefault/Extensions/Upgrade.py:1.2	Thu Jan 10 11:26:23 2002
+++ CMF/CMFDefault/Extensions/Upgrade.py	Thu Apr 22 13:47:51 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
-# 
+#
 ##############################################################################
 """
     Utility functions for upgrading CMFDefault-based sites.
@@ -38,10 +38,10 @@
         try:
 
             skins_tool._delObject( deleted )
-        
+
         except AttributeError:
             pass
-        
+
         else:
             log.append( 'Deleted CMFDecor skin directory: %s' % deleted )
 


=== CMF/CMFDefault/Extensions/migrate_ptk.py 1.1 => 1.1.74.1 ===
--- CMF/CMFDefault/Extensions/migrate_ptk.py:1.1	Mon Jun 11 15:22:13 2001
+++ CMF/CMFDefault/Extensions/migrate_ptk.py	Thu Apr 22 13:47:51 2004
@@ -118,7 +118,7 @@
         self._klass = to_class
         self._descend = descend
         self._show_dup = show_dup
-    
+
     def allowDescendChildren(self):
         return self._descend
 
@@ -148,7 +148,7 @@
             # Clear the children.
             newob._container = PersistentMapping()
         return newob
-        
+
 TupleType = type(())
 
 def setupDirectConversion(old_prod, new_prod, modname, classname,
@@ -230,7 +230,7 @@
                            'which is set to %s!%s' %
                            (join(ob.getPhysicalPath(), '/'),
                             join(old_udb, '/'), uid,))
-                
+
     if cleanup_children:
         if hasattr(ob, 'objectValues'):
             for subob in ob.objectValues():
@@ -238,7 +238,7 @@
 
     # Deactivate object if possible.
     if changed is None: ob._p_deactivate()
-    
+
     return res
 
 def _copyUsers(src_folder, dst_folder):
@@ -338,7 +338,7 @@
     content_product = 'PTKBase'
 else:
     content_product = 'PTKDemo'
-    
+
 
 setupDirectConversions(content_product, 'CMFDefault', demo_conversions,
                        ptk2cmf_conversions)


=== CMF/CMFDefault/Extensions/update_catalogIndexes.py 1.4 => 1.4.40.1 ===
--- CMF/CMFDefault/Extensions/update_catalogIndexes.py:1.4	Wed Jan 30 14:33:21 2002
+++ CMF/CMFDefault/Extensions/update_catalogIndexes.py	Thu Apr 22 13:47:51 2004
@@ -2,7 +2,7 @@
 
 def update_catalogIndexes(self, REQUEST):
     '''
-    External method to drop, re-add, and rebuild catalog Indexes for migrated 
+    External method to drop, re-add, and rebuild catalog Indexes for migrated
     CMF sites from Zope 2.3 to 2.4+.
     '''
     rIndexes = {'allowedRolesAndUsers': 'KeywordIndex'
@@ -10,6 +10,6 @@
               , 'expires': 'FieldIndex'}
     ct = getToolByName(self, 'portal_catalog')
     map(lambda x, ct=ct: ct.delIndex(x), rIndexes.keys())
-    map(lambda x, ct=ct: ct.addIndex(x[0], x[1]), rIndexes.items()) 
+    map(lambda x, ct=ct: ct.addIndex(x[0], x[1]), rIndexes.items())
     ct.manage_reindexIndex(ids=rIndexes.keys(), REQUEST=REQUEST)
     return 'Catalog Indexes rebuilt.'


=== CMF/CMFDefault/Extensions/update_discussion.py 1.1 => 1.1.74.1 ===
--- CMF/CMFDefault/Extensions/update_discussion.py:1.1	Thu Jun 14 16:27:46 2001
+++ CMF/CMFDefault/Extensions/update_discussion.py	Thu Apr 22 13:47:51 2004
@@ -18,7 +18,7 @@
 
           - Items which are replies to sibling items have the sibling's
             ID as their 'in_reply_to'.
-        
+
         The representation we are converting from was:
 
           - Items which are replies to the containing content object
@@ -54,7 +54,7 @@
         talkback = object.aq_parent
         path = item.getPath()
         in_reply_to = object.in_reply_to
-        
+
         if in_reply_to is None: # we've been here already
             continue
 
@@ -79,6 +79,5 @@
         object.reindexObject()
 
         a( path )
-    
-    return string.join( log, '\n' )
 
+    return string.join( log, '\n' )