From aa43dc2792c9d43dc5c844d8b5cb1675e45b65f0 Mon Sep 17 00:00:00 2001 From: Date: Tue, 5 Jul 2005 11:00:16 +0000 Subject: [PATCH] partially reverted r30994 to avoid infinite import loops --- ZCatalog.py | 3 --- tests/testCatalog.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ZCatalog.py b/ZCatalog.py index 1e680c1c..6a814834 100644 --- a/ZCatalog.py +++ b/ZCatalog.py @@ -37,10 +37,8 @@ import PluggableIndexInterface from Products.PluginIndexes.TextIndex import Splitter from zLOG import LOG -from zope.interface import implements from Catalog import Catalog, CatalogError -from interfaces import IZCatalog as z3IZCatalog from IZCatalog import IZCatalog as z2IZCatalog from ProgressHandler import ZLogHandler from ZCatalogIndexes import ZCatalogIndexes @@ -83,7 +81,6 @@ class is that it is not Zope specific. You can use it in any """ __implements__ = z2IZCatalog - implements(z3IZCatalog) meta_type = "ZCatalog" icon='misc_/ZCatalog/ZCatalog.gif' diff --git a/tests/testCatalog.py b/tests/testCatalog.py index 5ee6fad1..b33c9d1d 100644 --- a/tests/testCatalog.py +++ b/tests/testCatalog.py @@ -193,7 +193,7 @@ def test_z3interfaces(self): from Products.ZCatalog.ZCatalog import ZCatalog from zope.interface.verify import verifyClass - verifyClass(IZCatalog, ZCatalog) + verifyClass(IZCatalog, ZCatalog, 1) def testGetMetadataForUID(self): testNum = str(self.upper - 3) # as good as any..