[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - Catalog.py:1.111.2.1 CatalogAwareness.py:1.17.68.1 CatalogPathAwareness.py:1.11.16.1

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	Catalog.py CatalogAwareness.py CatalogPathAwareness.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/Products/ZCatalog/Catalog.py 1.111 => 1.111.2.1 ===
--- Zope/lib/python/Products/ZCatalog/Catalog.py:1.111	Tue May 27 00:47:43 2003
+++ Zope/lib/python/Products/ZCatalog/Catalog.py	Mon Jul 21 12:36:25 2003
@@ -209,7 +209,7 @@
         # new column? update the brain
         self.updateBrains()
 
-        self.__changed__(1)    #why?
+        self._p_changed = 1 # why?
 
     def delColumn(self, name):
         """


=== Zope/lib/python/Products/ZCatalog/CatalogAwareness.py 1.17 => 1.17.68.1 ===
--- Zope/lib/python/Products/ZCatalog/CatalogAwareness.py:1.17	Wed Aug 14 18:25:15 2002
+++ Zope/lib/python/Products/ZCatalog/CatalogAwareness.py	Mon Jul 21 12:36:25 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.11 => 1.11.16.1 ===
--- Zope/lib/python/Products/ZCatalog/CatalogPathAwareness.py:1.11	Sat Jan 11 07:20:36 2003
+++ Zope/lib/python/Products/ZCatalog/CatalogPathAwareness.py	Mon Jul 21 12:36:25 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):