[CMF-checkins] CVS: CMF/CMFCore - CatalogTool.py:1.52

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv9607/CMFCore

Modified Files:
	CatalogTool.py 
Log Message:
- removed pre Zope 2.6.4 compatibility code
- some whitespace cleanup


=== CMF/CMFCore/CatalogTool.py 1.51 => 1.52 ===
--- CMF/CMFCore/CatalogTool.py:1.51	Thu Apr 15 09:04:19 2004
+++ CMF/CMFCore/CatalogTool.py	Mon Apr 26 08:34:06 2004
@@ -217,12 +217,7 @@
         else:
             vars = {}
         w = IndexableObjectWrapper(vars, obj)
-        try:
-            ZCatalog.catalog_object(self, w, uid, idxs, update_metadata)
-        except TypeError:
-            # for Zope versions until 2.6.2
-            idxs = idxs or []
-            ZCatalog.catalog_object(self, w, uid, idxs)
+        ZCatalog.catalog_object(self, w, uid, idxs, update_metadata)
 
     security.declarePrivate('indexObject')
     def indexObject(self, object):