From 386ecfff0a8554656ea0eff86bc7d1e6f87ce3d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Beno=C3=AEt=20Pin?= Date: Mon, 25 Oct 2010 13:18:41 +0200 Subject: [PATCH] compat zope-2.12 --- interfaces/IUserFolder.py | 8 +------- interfaces/portal_groupdata.py | 7 +------ interfaces/portal_groups.py | 7 +------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/interfaces/IUserFolder.py b/interfaces/IUserFolder.py index 9892274..026a612 100644 --- 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' -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): diff --git a/interfaces/portal_groupdata.py b/interfaces/portal_groupdata.py index c0786a2..4fd35d9 100644 --- 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' -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 diff --git a/interfaces/portal_groups.py b/interfaces/portal_groups.py index 2be03ae..39f0766 100644 --- a/interfaces/portal_groups.py +++ b/interfaces/portal_groups.py @@ -29,12 +29,7 @@ __version__ = "$Revision: $" __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. -- 2.20.1