Mon Apr 26 08:34:41 EDT 2004

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

Modified Files:
	CachingPolicyManager.py ContentTypeRegistry.py Contentish.py 
	Discussions.py DublinCore.py Dynamic.py IOpaqueItems.py 
	IOrderSupport.py Syndicatable.py portal_actions.py 
	portal_catalog.py portal_discussion.py portal_memberdata.py 
	portal_membership.py portal_metadata.py portal_properties.py 
	portal_registration.py portal_skins.py portal_types.py 
	portal_undo.py portal_url.py portal_workflow.py 
Log Message:
- removed pre Zope 2.6.4 compatibility code
- some whitespace cleanup


=== CMF/CMFCore/interfaces/CachingPolicyManager.py 1.4 => 1.5 ===

--- CMF/CMFCore/interfaces/CachingPolicyManager.py:1.4	Mon Jan  6 15:37:21 2003
+++ CMF/CMFCore/interfaces/CachingPolicyManager.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Caching policies tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class CachingPolicyManager(Interface):


=== CMF/CMFCore/interfaces/ContentTypeRegistry.py 1.5 => 1.6 ===
--- CMF/CMFCore/interfaces/ContentTypeRegistry.py:1.5	Mon Jan  6 15:37:31 2003
+++ CMF/CMFCore/interfaces/ContentTypeRegistry.py	Mon Apr 26 08:34:10 2004
@@ -1,25 +1,21 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Putfactory registration tool interface.
 
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class ContentTypeRegistryPredicate(Interface):


=== CMF/CMFCore/interfaces/Contentish.py 1.5 => 1.6 ===
--- CMF/CMFCore/interfaces/Contentish.py:1.5	Mon Jan  6 15:37:41 2003
+++ CMF/CMFCore/interfaces/Contentish.py	Mon Apr 26 08:34:10 2004
@@ -1,41 +1,37 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Contentish type interface.
 
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class Contentish(Interface):
     """
     General interface for "contentish" items.
 
-    These methods need to be implemented by any class that wants to be a 
+    These methods need to be implemented by any class that wants to be a
     first-class citizen in the Portal Content world.
-    
+
     PortalContent implements this interface.
     """
-    
+
     def SearchableText():
         """
-        SearchableText is called to provide the Catalog with textual 
-        information about your object. It is a string usually generated 
+        SearchableText is called to provide the Catalog with textual
+        information about your object. It is a string usually generated
         by concatenating the string attributes of your content class. This
         string can then be used by the catalog to index your document and
         make it findable through the catalog.


=== CMF/CMFCore/interfaces/Discussions.py 1.3 => 1.4 ===
--- CMF/CMFCore/interfaces/Discussions.py:1.3	Mon Jan  6 15:37:50 2003
+++ CMF/CMFCore/interfaces/Discussions.py	Mon Apr 26 08:34:10 2004
@@ -1,25 +1,21 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Discussable interface.
 
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class Discussable(Interface):
@@ -33,7 +29,7 @@
         Permission: Reply to item
         Returns: HTML (directly or via redirect)
         """
-                       
+
     def getReplies():
         """
         Return a sequence of the DiscussionResponse objects which are


=== CMF/CMFCore/interfaces/DublinCore.py 1.6 => 1.7 ===
--- CMF/CMFCore/interfaces/DublinCore.py:1.6	Tue Dec 23 16:47:23 2003
+++ CMF/CMFCore/interfaces/DublinCore.py	Mon Apr 26 08:34:10 2004
@@ -15,11 +15,7 @@
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class DublinCore(Interface):


=== CMF/CMFCore/interfaces/Dynamic.py 1.4 => 1.5 ===
--- CMF/CMFCore/interfaces/Dynamic.py:1.4	Mon Mar  8 08:46:08 2004
+++ CMF/CMFCore/interfaces/Dynamic.py	Mon Apr 26 08:34:10 2004
@@ -1,25 +1,21 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Dynamic type interface.
 
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class DynamicType(Interface):
@@ -52,12 +48,12 @@
 
     def getIcon(relative_to_portal=0):
         """ Get the path to an object's icon.
-        
+
         This method is used in the folder_contents view to generate an
         appropriate icon for the items found in the folder.
 
         If the content item does not define an attribute named "icon"
-        this method will return the path "/misc_/dtmldoc.gif", which is 
+        this method will return the path "/misc_/dtmldoc.gif", which is
         the icon used for DTML Documents.
 
         If 'relative_to_portal' is true, return only the portion of


=== CMF/CMFCore/interfaces/IOpaqueItems.py 1.1 => 1.2 ===
--- CMF/CMFCore/interfaces/IOpaqueItems.py:1.1	Thu Jan  1 20:04:40 2004
+++ CMF/CMFCore/interfaces/IOpaqueItems.py	Mon Apr 26 08:34:10 2004
@@ -16,20 +16,16 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class ICallableOpaqueItemWithHooks(Interface):
     """Marker interface for callable opaque items with manage_* hooks.
-    
-    Opaque items are subelements that are contained using something that 
+
+    Opaque items are subelements that are contained using something that
     is not an ObjectManager.
-    
-    On add, copy, move and delete operations a marked opaque items 
-    'manage_afterAdd', 'manage_afterClone' and 'manage_beforeDelete' hooks 
+
+    On add, copy, move and delete operations a marked opaque items
+    'manage_afterAdd', 'manage_afterClone' and 'manage_beforeDelete' hooks
     get called.
     """


=== CMF/CMFCore/interfaces/IOrderSupport.py 1.1 => 1.2 ===
--- CMF/CMFCore/interfaces/IOrderSupport.py:1.1	Mon Apr 12 14:01:21 2004
+++ CMF/CMFCore/interfaces/IOrderSupport.py	Mon Apr 26 08:34:10 2004
@@ -17,11 +17,7 @@
 # this file is a copy of OFS/IOrderSupport.py,v 1.4 and should be removed again
 # if Zope versions before 2.7.1 are no longer supported
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class IOrderedContainer(Interface):


=== CMF/CMFCore/interfaces/Syndicatable.py 1.3 => 1.4 ===
--- CMF/CMFCore/interfaces/Syndicatable.py:1.3	Mon Jan  6 15:38:09 2003
+++ CMF/CMFCore/interfaces/Syndicatable.py	Mon Apr 26 08:34:10 2004
@@ -1,25 +1,21 @@
 ##############################################################################
 #
 # 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
-# 
+#
 ##############################################################################
 """ Syndicatable interface.
 
 $Id$
 """
 
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class Syndicatable(Interface):
@@ -31,7 +27,7 @@
         """
         Returns a list of results which is to be Syndicated.  For example, the normal call
         contentValues (on PortalFolders) returns a list of subObjects of the current object
-        (i.e. objectValues with filtering applied).  For the case of a Topic, one would 
+        (i.e. objectValues with filtering applied).  For the case of a Topic, one would
         return a sequence of objects from a catalog query, not the subObjects of the Topic.
         What is returned must implement the DublinCore.
         """


=== CMF/CMFCore/interfaces/portal_actions.py 1.14 => 1.15 ===
--- CMF/CMFCore/interfaces/portal_actions.py:1.14	Mon Jan  5 12:29:20 2004
+++ CMF/CMFCore/interfaces/portal_actions.py	Mon Apr 26 08:34:10 2004
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_actions(Interface):


=== CMF/CMFCore/interfaces/portal_catalog.py 1.8 => 1.9 ===
--- CMF/CMFCore/interfaces/portal_catalog.py:1.8	Sun Dec  7 12:31:21 2003
+++ CMF/CMFCore/interfaces/portal_catalog.py	Mon Apr 26 08:34:10 2004
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_catalog(Interface):


=== CMF/CMFCore/interfaces/portal_discussion.py 1.7 => 1.8 ===
--- CMF/CMFCore/interfaces/portal_discussion.py:1.7	Mon Jan  6 15:38:40 2003
+++ CMF/CMFCore/interfaces/portal_discussion.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Discussion tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class oldstyle_portal_discussion(Interface):


=== CMF/CMFCore/interfaces/portal_memberdata.py 1.9 => 1.10 ===
--- CMF/CMFCore/interfaces/portal_memberdata.py:1.9	Wed Sep 24 06:02:14 2003
+++ CMF/CMFCore/interfaces/portal_memberdata.py	Mon Apr 26 08:34:10 2004
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_memberdata(Interface):
@@ -38,11 +34,11 @@
     ## getMemberDataContents__roles__ = ()  # Private.
     def getMemberDataContents():
         '''
-        Returns a list containing a dictionary with information 
-        about the _members BTree contents: member_count is the 
+        Returns a list containing a dictionary with information
+        about the _members BTree contents: member_count is the
         total number of member instances stored in the memberdata-
-        tool while orphan_count is the number of member instances 
-        that for one reason or another are no longer in the 
+        tool while orphan_count is the number of member instances
+        that for one reason or another are no longer in the
         underlying acl_users user folder.
         The result is designed to be iterated over in a dtml-in
         '''


=== CMF/CMFCore/interfaces/portal_membership.py 1.9 => 1.10 ===
--- CMF/CMFCore/interfaces/portal_membership.py:1.9	Mon Sep 29 07:19:38 2003
+++ CMF/CMFCore/interfaces/portal_membership.py	Mon Apr 26 08:34:10 2004
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_membership(Interface):


=== CMF/CMFCore/interfaces/portal_metadata.py 1.4 => 1.5 ===
--- CMF/CMFCore/interfaces/portal_metadata.py:1.4	Mon Jan  6 15:39:12 2003
+++ CMF/CMFCore/interfaces/portal_metadata.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Metadata registration tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_metadata(Interface):


=== CMF/CMFCore/interfaces/portal_properties.py 1.3 => 1.4 ===
--- CMF/CMFCore/interfaces/portal_properties.py:1.3	Mon Sep  1 11:18:35 2003
+++ CMF/CMFCore/interfaces/portal_properties.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Properties tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_properties(Interface):


=== CMF/CMFCore/interfaces/portal_registration.py 1.6 => 1.7 ===
--- CMF/CMFCore/interfaces/portal_registration.py:1.6	Mon Jan  6 15:39:23 2003
+++ CMF/CMFCore/interfaces/portal_registration.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Registration tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_registration(Interface):


=== CMF/CMFCore/interfaces/portal_skins.py 1.9 => 1.10 ===
--- CMF/CMFCore/interfaces/portal_skins.py:1.9	Thu Feb  5 08:30:02 2004
+++ CMF/CMFCore/interfaces/portal_skins.py	Mon Apr 26 08:34:10 2004
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class SkinsContainer(Interface):


=== CMF/CMFCore/interfaces/portal_types.py 1.15 => 1.16 ===
--- CMF/CMFCore/interfaces/portal_types.py:1.15	Wed Mar  3 19:05:46 2004
+++ CMF/CMFCore/interfaces/portal_types.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Type registration tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class ContentTypeInformation(Interface):
@@ -34,7 +30,7 @@
         o Deprecated (not all objects of a given type may even share
           the same meta_type).
         """
-    
+
     def Title():
         """
             Return the "human readable" type name (note that it
@@ -42,13 +38,13 @@
             l10n/i18n or where a single content class is being
             used twice, under different names.
         """
-    
+
     def Description():
         """
             Textual description of the class of objects (intended
             for display in a "constructor list").
         """
-    
+
     def isConstructionAllowed(container):
         """
         Does the current user have the permission required in
@@ -149,7 +145,7 @@
             the list to include only types which are addable in
             'container'.
         """
-    
+
     def constructContent(contentType, container, id, RESPONSE=None
                         , *args, **kw):
         """


=== CMF/CMFCore/interfaces/portal_undo.py 1.5 => 1.6 ===
--- CMF/CMFCore/interfaces/portal_undo.py:1.5	Mon Jan  6 15:39:56 2003
+++ CMF/CMFCore/interfaces/portal_undo.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Undo tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_undo(Interface):


=== CMF/CMFCore/interfaces/portal_url.py 1.4 => 1.5 ===
--- CMF/CMFCore/interfaces/portal_url.py:1.4	Thu Feb 13 03:31:31 2003
+++ CMF/CMFCore/interfaces/portal_url.py	Mon Apr 26 08:34:10 2004
@@ -1,14 +1,14 @@
 ##############################################################################
 #
 # Copyright (c) 2002 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
-# 
+#
 ##############################################################################
 """ URL tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 
 class portal_url(Interface):


=== CMF/CMFCore/interfaces/portal_workflow.py 1.11 => 1.12 ===
--- CMF/CMFCore/interfaces/portal_workflow.py:1.11	Mon Jan  6 15:40:16 2003
+++ CMF/CMFCore/interfaces/portal_workflow.py	Mon Apr 26 08:34:10 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
-# 
+#
 ##############################################################################
 """ Workflow tool interface.
 
@@ -16,11 +16,7 @@
 """
 
 from Interface import Attribute
-try:
-    from Interface import Interface
-except ImportError:
-    # for Zope versions before 2.6.0
-    from Interface import Base as Interface
+from Interface import Interface
 
 _marker = []
 


