[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/PluginIndexes/common/UnIndex.py removed some more obsolete code

Andreas Jung andreas at andreas-jung.com
Sun Jan 30 08:50:30 EST 2005


Log message for revision 28980:
  removed some more obsolete code
  

Changed:
  U   Zope/trunk/lib/python/Products/PluginIndexes/common/UnIndex.py

-=-
Modified: Zope/trunk/lib/python/Products/PluginIndexes/common/UnIndex.py
===================================================================
--- Zope/trunk/lib/python/Products/PluginIndexes/common/UnIndex.py	2005-01-30 13:30:06 UTC (rev 28979)
+++ Zope/trunk/lib/python/Products/PluginIndexes/common/UnIndex.py	2005-01-30 13:50:30 UTC (rev 28980)
@@ -4,7 +4,6 @@
 #
 # 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.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE
@@ -144,13 +143,13 @@
                 indexRow.remove(documentId)
                 if not indexRow:
                     del self._index[entry]
-                    try: self._length.change(-1)
-                    except AttributeError: pass # pre-BTrees-module instance
+                    self._length.change(-1)
+                    
             except AttributeError:
                 # index row is an int
                 del self._index[entry]
-                try: self._length.change(-1)
-                except AttributeError: pass # pre-BTrees-module instance
+                self._length.change(-1)
+                
             except:
                 LOG.error('%s: unindex_object could not remove '
                           'documentId %s from index %s.  This '
@@ -176,8 +175,7 @@
         # an IntSet and stuff it in first.
         if indexRow is _marker:
             self._index[entry] = documentId
-            try:  self._length.change(1)
-            except AttributeError: pass # pre-BTrees-module instance
+            self._length.change(1)
         else:
             try: indexRow.insert(documentId)
             except AttributeError:



More information about the Zope-Checkins mailing list