compat zope-2.12

diff --git a/interfaces/IUserFolder.py b/interfaces/IUserFolder.py
index 989227403097a65d2c924470744d40a36d4d7aa5..026a612f7ed65e15a600b63792bf48dcc12df35f 100644 (file)
--- a/interfaces/IUserFolder.py
+++ b/interfaces/IUserFolder.py
@@ -40,13 +40,7 @@ __version__ = "$Revision:  $"
 # $Id: IUserFolder.py 30098 2006-09-08 12:35:01Z encolpe $
 __docformat__ = 'restructuredtext'
 
 # $Id: IUserFolder.py 30098 2006-09-08 12:35:01Z encolpe $
 __docformat__ = 'restructuredtext'
 

-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 zope.interface import Interface, Attribute

 
 
 class IUserFolder(Interface):
 
 
 class IUserFolder(Interface):

diff --git a/interfaces/portal_groupdata.py b/interfaces/portal_groupdata.py
index c0786a23c24f4f03096bf67c38a1e08001fe585d..4fd35d9b66f4e7a5ca64fff6e98b39b9bc978c7f 100644 (file)
--- a/interfaces/portal_groupdata.py
+++ b/interfaces/portal_groupdata.py
@@ -28,12 +28,7 @@ __version__ = "$Revision:  $"
 # $Id: portal_groupdata.py 30098 2006-09-08 12:35:01Z encolpe $
 __docformat__ = 'restructuredtext'
 
 # $Id: portal_groupdata.py 30098 2006-09-08 12:35:01Z encolpe $
 __docformat__ = 'restructuredtext'
 

-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 zope.interface import Interface, Attribute

 
 class portal_groupdata(Interface):
     """ A helper tool for portal_groups that transparently adds
 
 class portal_groupdata(Interface):
     """ A helper tool for portal_groups that transparently adds

diff --git a/interfaces/portal_groups.py b/interfaces/portal_groups.py
index 2be03aef455026761e0d305ed340d64ac0cccdce..39f076600e0d0f0af4fdfa36ef807d53092b2125 100644 (file)
--- a/interfaces/portal_groups.py
+++ b/interfaces/portal_groups.py
@@ -29,12 +29,7 @@ __version__ = "$Revision:  $"
 __docformat__ = 'restructuredtext'
 
 
 __docformat__ = 'restructuredtext'
 
 

-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 zope.interface import Interface, Attribute

 
 class portal_groups(Interface):
     """Defines an interface for working with groups in an abstract manner.
 
 class portal_groups(Interface):
     """Defines an interface for working with groups in an abstract manner.