[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - CatalogAwareness.py:1.17.6.1 CatalogPathAwareness.py:1.10.6.2

[Stuart Bishop]

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

Modified Files:
      Tag: Zope-2_6-branch
	CatalogAwareness.py CatalogPathAwareness.py 
Log Message:
Fix bug #458 correctly

=== Zope/lib/python/Products/ZCatalog/CatalogAwareness.py 1.17 => 1.17.6.1 ===
--- Zope/lib/python/Products/ZCatalog/CatalogAwareness.py:1.17	Wed Aug 14 18:25:15 2002
+++ Zope/lib/python/Products/ZCatalog/CatalogAwareness.py	Fri Jul 18 10:34:17 2003
@@ -133,5 +133,5 @@
         if hasattr(aq_base(obj), 'objectValues'):
             sub=obj.objectValues()
             for item in obj.objectValues():
-                self.reindex_all(self, item)
+                self.reindex_all(item)
         return 'done!'


=== Zope/lib/python/Products/ZCatalog/CatalogPathAwareness.py 1.10.6.1 => 1.10.6.2 ===
--- Zope/lib/python/Products/ZCatalog/CatalogPathAwareness.py:1.10.6.1	Sat Jan 11 07:19:49 2003
+++ Zope/lib/python/Products/ZCatalog/CatalogPathAwareness.py	Fri Jul 18 10:34:17 2003
@@ -118,7 +118,7 @@
         if hasattr(aq_base(obj), 'objectValues'):
             sub=obj.objectValues()
             for item in obj.objectValues():
-                self.reindex_all(self, item)
+                self.reindex_all(item)
         return 'done!'
 
 class CatalogPathAware(CatalogAware):