partially reverted r30994 to avoid infinite import loops

zopefoundation · Jul 5, 2005 · aa43dc2 · aa43dc2
1 parent 7ff6450
commit aa43dc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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..