[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - ZCatalog.py:1.127.6.1 ZCatalogIndexes.py:1.8.86.1

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv26022/lib/python/Products/ZCatalog

Modified Files:
      Tag: mro-advanture-branch
	ZCatalog.py ZCatalogIndexes.py 
Log Message:
Changed various modules to fix mro problems when using the C3
method-lookup algorithm.


=== Zope/lib/python/Products/ZCatalog/ZCatalog.py 1.127 => 1.127.6.1 ===
--- Zope/lib/python/Products/ZCatalog/ZCatalog.py:1.127	Tue Oct  7 14:20:58 2003
+++ Zope/lib/python/Products/ZCatalog/ZCatalog.py	Fri Oct 31 14:24:22 2003
@@ -55,7 +55,7 @@
         return self.manage_main(self, REQUEST,update_menu=1)
 
 
-class ZCatalog(Folder, Persistent, Implicit):
+class ZCatalog(Folder):
     __implements__ = IZCatalog
 
     """ZCatalog object


=== Zope/lib/python/Products/ZCatalog/ZCatalogIndexes.py 1.8 => 1.8.86.1 ===
--- Zope/lib/python/Products/ZCatalog/ZCatalogIndexes.py:1.8	Wed Aug 14 18:25:15 2002
+++ Zope/lib/python/Products/ZCatalog/ZCatalogIndexes.py	Fri Oct 31 14:24:22 2003
@@ -33,7 +33,7 @@
 
 _marker = []
 
-class ZCatalogIndexes (IFAwareObjectManager, Folder, Persistent, Implicit):
+class ZCatalogIndexes (IFAwareObjectManager, Folder):
     """A mapping object, responding to getattr requests by looking up
     the requested indexes in an object manager."""