Commit d41de6d5 authored by Andreas Jung's avatar Andreas Jung

removed some more obsolete code

parent 7570aeaf
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
# #
# This software is subject to the provisions of the Zope Public License, # This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE # FOR A PARTICULAR PURPOSE
...@@ -144,13 +143,13 @@ class UnIndex(SimpleItem): ...@@ -144,13 +143,13 @@ class UnIndex(SimpleItem):
indexRow.remove(documentId) indexRow.remove(documentId)
if not indexRow: if not indexRow:
del self._index[entry] del self._index[entry]
try: self._length.change(-1) self._length.change(-1)
except AttributeError: pass # pre-BTrees-module instance
except AttributeError: except AttributeError:
# index row is an int # index row is an int
del self._index[entry] del self._index[entry]
try: self._length.change(-1) self._length.change(-1)
except AttributeError: pass # pre-BTrees-module instance
except: except:
LOG.error('%s: unindex_object could not remove ' LOG.error('%s: unindex_object could not remove '
'documentId %s from index %s. This ' 'documentId %s from index %s. This '
...@@ -176,8 +175,7 @@ class UnIndex(SimpleItem): ...@@ -176,8 +175,7 @@ class UnIndex(SimpleItem):
# an IntSet and stuff it in first. # an IntSet and stuff it in first.
if indexRow is _marker: if indexRow is _marker:
self._index[entry] = documentId self._index[entry] = documentId
try: self._length.change(1) self._length.change(1)
except AttributeError: pass # pre-BTrees-module instance
else: else:
try: indexRow.insert(documentId) try: indexRow.insert(documentId)
except AttributeError: except AttributeError:
......
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