[CMF-checkins] SVN: CMF/trunk/ - removed support for Zope 2.8.0
Yvo Schubbe
y.2005- at wcm-solutions.de
Wed Sep 7 04:44:38 EDT 2005
Log message for revision 38337:
- removed support for Zope 2.8.0
Changed:
U CMF/trunk/CHANGES.txt
U CMF/trunk/CMFActionIcons/DEPENDENCIES.txt
U CMF/trunk/CMFCalendar/DEPENDENCIES.txt
U CMF/trunk/CMFCore/CatalogTool.py
U CMF/trunk/CMFCore/DEPENDENCIES.txt
U CMF/trunk/CMFCore/tests/test_CMFBTreeFolder.py
U CMF/trunk/CMFDefault/DEPENDENCIES.txt
U CMF/trunk/CMFSetup/DEPENDENCIES.txt
U CMF/trunk/CMFTopic/DEPENDENCIES.txt
U CMF/trunk/CMFUid/DEPENDENCIES.txt
U CMF/trunk/DCWorkflow/DEPENDENCIES.txt
-=-
Modified: CMF/trunk/CHANGES.txt
===================================================================
--- CMF/trunk/CHANGES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CHANGES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -81,7 +81,7 @@
- Some simplifications to the slurp_release release helper script and
updates to the RELEASE.txt release instructions.
- - The CMF now depends on Zope 2.8 / Five.
+ - The CMF now depends on Zope 2.8.1 including Five.
- Non-release packages moved out of the /CMF/ repository package:
Modified: CMF/trunk/CMFActionIcons/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFActionIcons/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFActionIcons/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,2 +1,2 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
Modified: CMF/trunk/CMFCalendar/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFCalendar/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFCalendar/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,4 +1,4 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
CMFDefault
CMFSetup
Modified: CMF/trunk/CMFCore/CatalogTool.py
===================================================================
--- CMF/trunk/CMFCore/CatalogTool.py 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFCore/CatalogTool.py 2005-09-07 08:44:38 UTC (rev 38337)
@@ -342,63 +342,4 @@
idxs = [i for i in idxs if i in valid_indexes]
self.catalog_object(object, uid, idxs, update_metadata)
- # BBB: for Zope 2.8.0
- # copied from revision 31005 of ZCatalog.py
- def manage_convertIndexes(self, REQUEST=None, RESPONSE=None, URL1=None):
- """Recreate indexes derived from UnIndex because the implementation of
- __len__ changed in Zope 2.8. Pre-Zope 2.7 installation used to implement
- __len__ as persistent attribute of the index instance which is totally
- incompatible with the new extension class implementation based on new-style
- classes.
- """
-
- LOG.info('Start migration of indexes for %s' % self.absolute_url(1))
-
- reindex_ids = []
-
- for idx in self.Indexes.objectValues():
- bases = [str(name) for name in idx.__class__.__bases__]
- found = False
-
- if idx.meta_type == 'PathIndex':
- found = True
- else:
- for base in bases:
- if 'UnIndex' in base:
- found = True
- break
-
- if found:
- idx_type = idx.meta_type
- idx_id = idx.getId()
- LOG.info('processing index %s' % idx_id)
-
- indexed_attrs = getattr(idx, 'indexed_attrs', None)
-
- if idx.meta_type == 'DateRangeIndex':
- since_field = getattr(idx, '_since_field', None)
- until_field = getattr(idx, '_until_field', None)
-
- self.delIndex(idx.getId())
- self.addIndex(idx_id, idx_type)
- new_idx = self.Indexes[idx_id]
-
- if indexed_attrs:
- setattr(new_idx, 'indexed_attrs', indexed_attrs)
- if idx.meta_type == 'DateRangeIndex':
- setattr(new_idx, '_since_field', since_field)
- setattr(new_idx, '_until_field', until_field)
- reindex_ids.append(idx_id)
-
- if reindex_ids:
- LOG.info('Reindexing %s' % ', '.join(reindex_ids))
- self.manage_reindexIndex(reindex_ids, REQUEST)
-
- self._migrated_280 = True
- LOG.info('Finished migration of indexes for %s' % self.absolute_url(1))
-
- if RESPONSE:
- RESPONSE.redirect( URL1 +
- '/manage_main?manage_tabs_message=Indexes%20converted%20and%20reindexed')
-
InitializeClass(CatalogTool)
Modified: CMF/trunk/CMFCore/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFCore/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFCore/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1 +1 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
Modified: CMF/trunk/CMFCore/tests/test_CMFBTreeFolder.py
===================================================================
--- CMF/trunk/CMFCore/tests/test_CMFBTreeFolder.py 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFCore/tests/test_CMFBTreeFolder.py 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,3 +1,15 @@
+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (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.
+#
+##############################################################################
""" Unit test for CMFBTreeFolder
$Id$
@@ -4,7 +16,11 @@
"""
import unittest
+import Testing
+import Zope2
+Zope2.startup()
+
class CMFBTreeFolderTests(unittest.TestCase):
def _getTargetClass(self):
@@ -22,25 +38,17 @@
self.assertEqual( len( empty.objectIds() ), 0 )
def test___module_aliases__( self ):
-
- # This test will *fail* on Zope 2.8.0, because it (erroneously)
- # included CMFBTreeFolder in the core BTreeFolder2 product.
+
from Products.BTreeFolder2.CMFBTreeFolder \
import CMFBTreeFolder as BBB
self.failUnless( BBB is self._getTargetClass() )
-
+
def test_suite():
- suite = unittest.TestSuite()
- # Don't test CMFBTreeFolder unless the underlying support is present.
- try:
- import Products.BTreeFolder2
- except ImportError:
- pass
- else:
- suite.addTest( unittest.makeSuite( CMFBTreeFolderTests ) )
- return suite
+ return unittest.TestSuite((
+ unittest.makeSuite(CMFBTreeFolderTests),
+ ))
if __name__ == '__main__':
- unittest.main( defaultTest='test_suite' )
+ unittest.main(defaultTest='test_suite')
Modified: CMF/trunk/CMFDefault/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFDefault/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFDefault/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,4 +1,4 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
CMFSetup
CMFTopic
Modified: CMF/trunk/CMFSetup/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFSetup/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFSetup/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,3 +1,3 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
DCWorkflow
Modified: CMF/trunk/CMFTopic/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFTopic/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFTopic/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,2 +1,2 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
Modified: CMF/trunk/CMFUid/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/CMFUid/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/CMFUid/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,3 +1,3 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
CMFSetup
Modified: CMF/trunk/DCWorkflow/DEPENDENCIES.txt
===================================================================
--- CMF/trunk/DCWorkflow/DEPENDENCIES.txt 2005-09-07 04:46:17 UTC (rev 38336)
+++ CMF/trunk/DCWorkflow/DEPENDENCIES.txt 2005-09-07 08:44:38 UTC (rev 38337)
@@ -1,2 +1,2 @@
-Zope >= 2.8.0
+Zope >= 2.8.1
CMFCore
More information about the CMF-checkins
mailing list