[CMF-checkins] CVS: CMF/CMFCore - PortalFolder.py:1.63 OrderSupport.py:NONE

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv23286/CMFCore

Modified Files:
	PortalFolder.py 
Removed Files:
	OrderSupport.py 
Log Message:
- removed pre Zope 2.7.0 compatibility code


=== CMF/CMFCore/PortalFolder.py 1.62 => 1.63 ===
--- CMF/CMFCore/PortalFolder.py:1.62	Wed May  5 10:18:23 2004
+++ CMF/CMFCore/PortalFolder.py	Tue Jun  1 11:56:13 2004
@@ -18,7 +18,6 @@
 import base64
 import marshal
 import re
-from sys import exc_info
 from warnings import warn
 
 from AccessControl import ClassSecurityInfo
@@ -26,19 +25,9 @@
 from Acquisition import aq_parent, aq_inner, aq_base
 from Globals import DTMLFile
 from Globals import InitializeClass
-from OFS.Folder import Folder
+from OFS.OrderedFolder import OrderedFolder
 from OFS.ObjectManager import REPLACEABLE
 
-try:
-    from OFS.OrderSupport import OrderSupport
-    if not 'subset_ids' in \
-            OrderSupport.moveObjectsByDelta.im_func.func_code.co_varnames:
-        # for Zope versions before 2.7.1
-        from OrderSupport import OrderSupport
-except ImportError:
-    # for Zope versions before 2.7.0
-    from OrderSupport import OrderSupport
-
 from CMFCatalogAware import CMFCatalogAware
 from exceptions import AccessControl_Unauthorized
 from exceptions import zExceptions_Unauthorized
@@ -105,22 +94,20 @@
 )
 
 
-class PortalFolder(DynamicType, CMFCatalogAware, OrderSupport, Folder):
+class PortalFolder(DynamicType, CMFCatalogAware, OrderedFolder):
     """
         Implements portal content management, but not UI details.
     """
     meta_type = 'Portal Folder'
     portal_type = 'Folder'
 
-    __implements__ = (DynamicType.__implements__, OrderSupport.__implements__,
-                      Folder.__implements__)
+    __implements__ = (DynamicType.__implements__, OrderedFolder.__implements__)
 
     security = ClassSecurityInfo()
 
     description = ''
 
-    manage_options = ( OrderSupport.manage_options +
-                       Folder.manage_options[1:] +
+    manage_options = ( OrderedFolder.manage_options +
                        CMFCatalogAware.manage_options )
 
     def __init__( self, id, title='' ):
@@ -409,11 +396,6 @@
             self._checkId(id)
         except BadRequest:
             return 0
-        except:
-            # for Zope versions before 2.7.0
-            if exc_info()[0] == 'Bad Request':
-                return 0
-            raise  # Some other exception.
         else:
             return 1
 

=== Removed File CMF/CMFCore/OrderSupport.py ===