Commit b2b44418 authored by Andreas Jung's avatar Andreas Jung

- Catalog.clear(): fixed handling of _length attribute (caused import

        problems for some .zexp files e.g. Squishdot instances)
parent 9fc92426
...@@ -49,6 +49,9 @@ Zope Changes ...@@ -49,6 +49,9 @@ Zope Changes
Bugs fixed 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 - Collector #1773: by default user accounts are now encrypted for
security reasons security reasons
......
...@@ -78,7 +78,6 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base): ...@@ -78,7 +78,6 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
# object unique identifier to the rid, and self.paths is a # object unique identifier to the rid, and self.paths is a
# mapping of the rid to the unique identifier. # mapping of the rid to the unique identifier.
self._length = BTrees.Length.Length()
self.clear() self.clear()
if brains is not None: if brains is not None:
...@@ -103,7 +102,7 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base): ...@@ -103,7 +102,7 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
self.data = IOBTree() # mapping of rid to meta_data self.data = IOBTree() # mapping of rid to meta_data
self.uids = OIBTree() # mapping of uid to rid self.uids = OIBTree() # mapping of uid to rid
self.paths = IOBTree() # mapping of rid to uid self.paths = IOBTree() # mapping of rid to uid
self._length.set(0) self._length = BTrees.Length.Length()
for index in self.indexes.keys(): for index in self.indexes.keys():
self.getIndex(index).clear() self.getIndex(index).clear()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment