[Zope-Checkins] SVN: Zope/trunk/ - Catalog.clear(): fixed handling of _length attribute (caused import

[Andreas Jung]

Log message for revision 37950:
        - Catalog.clear(): fixed handling of _length attribute (caused import
          problems for some .zexp files e.g. Squishdot instances)
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Products/ZCatalog/Catalog.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-08-16 10:05:19 UTC (rev 37949)
+++ Zope/trunk/doc/CHANGES.txt	2005-08-16 10:07:09 UTC (rev 37950)
@@ -49,6 +49,9 @@
 
     Bugs fixed
 
+      - Catalog.clear(): fixed handling of _length attribute (caused import
+        problems for some .zexp files e.g. Squishdot instances)
+
       - Collector #1773: by default user accounts are now encrypted for
         security reasons
 

Modified: Zope/trunk/lib/python/Products/ZCatalog/Catalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/Catalog.py	2005-08-16 10:05:19 UTC (rev 37949)
+++ Zope/trunk/lib/python/Products/ZCatalog/Catalog.py	2005-08-16 10:07:09 UTC (rev 37950)
@@ -78,7 +78,6 @@
         # object unique identifier to the rid, and self.paths is a
         # mapping of the rid to the unique identifier.
 
-        self._length = BTrees.Length.Length()
         self.clear()
 
         if brains is not None:
@@ -103,7 +102,7 @@
         self.data  = IOBTree()  # mapping of rid to meta_data
         self.uids  = OIBTree()  # mapping of uid to rid
         self.paths = IOBTree()  # mapping of rid to uid
-        self._length.set(0)
+        self._length = BTrees.Length.Length()
 
         for index in self.indexes.keys():
             self.getIndex(index).clear()