Log message for revision 30999: partially reverted r30994 to avoid infinite import loops
Changed: U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/common/UnIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/ZCTextIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py U Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py U Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/tests/testCatalog.py -=- Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateIndex/tests/test_DateIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -172,9 +172,9 @@ from zope.interface.verify import verifyClass verifyClass(IDateIndex, DateIndex) - verifyClass(IPluggableIndex, DateIndex) - verifyClass(ISortIndex, DateIndex) - verifyClass(IUniqueValueIndex, DateIndex) + verifyClass(IPluggableIndex, DateIndex, 1) + verifyClass(ISortIndex, DateIndex, 1) + verifyClass(IUniqueValueIndex, DateIndex, 1) def test_empty(self): empty = self._index Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/DateRangeIndex/tests/test_DateRangeIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -88,9 +88,9 @@ from zope.interface.verify import verifyClass verifyClass(IDateRangeIndex, DateRangeIndex) - verifyClass(IPluggableIndex, DateRangeIndex) - verifyClass(ISortIndex, DateRangeIndex) - verifyClass(IUniqueValueIndex, DateRangeIndex) + verifyClass(IPluggableIndex, DateRangeIndex, 1) + verifyClass(ISortIndex, DateRangeIndex, 1) + verifyClass(IUniqueValueIndex, DateRangeIndex, 1) def test_empty( self ): Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/FieldIndex/tests/testFieldIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -100,9 +100,9 @@ from Products.PluginIndexes.interfaces import IUniqueValueIndex from zope.interface.verify import verifyClass - verifyClass(IPluggableIndex, FieldIndex) - verifyClass(ISortIndex, FieldIndex) - verifyClass(IUniqueValueIndex, FieldIndex) + verifyClass(IPluggableIndex, FieldIndex, 1) + verifyClass(ISortIndex, FieldIndex, 1) + verifyClass(IUniqueValueIndex, FieldIndex, 1) def testEmpty( self ): "Test an empty FieldIndex." Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/KeywordIndex/tests/testKeywordIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -120,9 +120,9 @@ from Products.PluginIndexes.interfaces import IUniqueValueIndex from zope.interface.verify import verifyClass - verifyClass(IPluggableIndex, KeywordIndex) - verifyClass(ISortIndex, KeywordIndex) - verifyClass(IUniqueValueIndex, KeywordIndex) + verifyClass(IPluggableIndex, KeywordIndex, 1) + verifyClass(ISortIndex, KeywordIndex, 1) + verifyClass(IUniqueValueIndex, KeywordIndex, 1) def testAddObjectWOKeywords(self): Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -30,7 +30,6 @@ from Products.PluginIndexes.common import safe_callable from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.interfaces import IPathIndex -from Products.PluginIndexes.interfaces import IUniqueValueIndex _marker = [] LOG = getLogger('Zope.PathIndex') @@ -53,7 +52,7 @@ """ __implements__ = (PluggableIndex.UniqueValueIndex,) - implements(IPathIndex, IUniqueValueIndex) + implements(IPathIndex) meta_type="PathIndex" Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/PathIndex/tests/testPathIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -75,7 +75,7 @@ from zope.interface.verify import verifyClass verifyClass(IPathIndex, PathIndex) - verifyClass(IUniqueValueIndex, PathIndex) + verifyClass(IUniqueValueIndex, PathIndex, 1) def testEmpty(self): self.assertEqual(self._index.numObjects() ,0) Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/TextIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -34,7 +34,6 @@ from Products.PluginIndexes.common import safe_callable from Products.PluginIndexes.common.ResultList import ResultList from Products.PluginIndexes.common.util import parseIndexRequest -from Products.PluginIndexes.interfaces import IPluggableIndex from Products.PluginIndexes.interfaces import ITextIndex from Lexicon import Lexicon @@ -78,7 +77,7 @@ """ __implements__ = (PluggableIndex.PluggableIndexInterface,) - implements(ITextIndex, IPluggableIndex) + implements(ITextIndex) meta_type='TextIndex' Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -92,7 +92,7 @@ from Products.PluginIndexes.TextIndex.TextIndex import TextIndex from zope.interface.verify import verifyClass - verifyClass(IPluggableIndex, TextIndex) + verifyClass(IPluggableIndex, TextIndex, 1) verifyClass(ITextIndex, TextIndex) def test_SimpleAddDelete(self): Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -25,7 +25,6 @@ from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes.common.util import parseIndexRequest -from Products.PluginIndexes.interfaces import IPluggableIndex from Products.PluginIndexes.interfaces import ITopicIndex import FilteredSet @@ -43,7 +42,7 @@ """ __implements__ = (PluggableIndex.PluggableIndexInterface,) - implements(ITopicIndex, IPluggableIndex) + implements(ITopicIndex) meta_type="TopicIndex" query_options = ('query','operator') Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/TopicIndex/tests/testTopicIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -71,7 +71,7 @@ from zope.interface.verify import verifyClass verifyClass(ITopicIndex, TopicIndex) - verifyClass(IPluggableIndex, TopicIndex) + verifyClass(IPluggableIndex, TopicIndex, 1) def testOr(self): self._searchOr('doc1',[1,2]) Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/common/UnIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/common/UnIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/PluginIndexes/common/UnIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -24,14 +24,10 @@ import BTrees.Length from BTrees.OOBTree import OOBTree from OFS.SimpleItem import SimpleItem -from zope.interface import implements from Products.PluginIndexes import PluggableIndex from Products.PluginIndexes.common import safe_callable from Products.PluginIndexes.common.util import parseIndexRequest -from Products.PluginIndexes.interfaces import IPluggableIndex -from Products.PluginIndexes.interfaces import ISortIndex -from Products.PluginIndexes.interfaces import IUniqueValueIndex _marker = [] LOG = getLogger('Zope.UnIndex') @@ -44,7 +40,6 @@ __implements__ = (PluggableIndex.UniqueValueIndex, PluggableIndex.SortIndex) - implements(IPluggableIndex, IUniqueValueIndex, ISortIndex) def __init__( self, id, ignore_ex=None, call_methods=None, extra=None, caller=None): Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/ZCTextIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/ZCTextIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/ZCTextIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -31,7 +31,6 @@ PluggableIndexInterface from Products.PluginIndexes.common.util import parseIndexRequest from Products.PluginIndexes.common import safe_callable -from Products.PluginIndexes.interfaces import IPluggableIndex from Products.ZCTextIndex.ILexicon import ILexicon from Products.ZCTextIndex.Lexicon import \ @@ -55,7 +54,7 @@ """ __implements__ = PluggableIndexInterface - implements(IZCTextIndex, IPluggableIndex) + implements(IZCTextIndex) ## Magic class attributes ## Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCTextIndex/tests/testZCTextIndex.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -267,7 +267,7 @@ from Products.ZCTextIndex.interfaces import IZCTextIndex from zope.interface.verify import verifyClass - verifyClass(IPluggableIndex, ZCTextIndex) + verifyClass(IPluggableIndex, ZCTextIndex, 1) verifyClass(IZCTextIndex, ZCTextIndex) def testRanking(self): Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -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 @@ """ __implements__ = z2IZCatalog - implements(z3IZCatalog) meta_type = "ZCatalog" icon='misc_/ZCatalog/ZCatalog.gif' Modified: Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/tests/testCatalog.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-07-04 19:14:34 UTC (rev 30998) +++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-07-05 11:00:16 UTC (rev 30999) @@ -193,7 +193,7 @@ 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.. _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins