[Checkins] SVN: Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py Produce clearer error messages when called with deprecated uid arg

[Ross Patterson]

Log message for revision 123270:
  Produce clearer error messages when called with deprecated uid arg

Changed:
  U   Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py

-=-
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py	2011-11-03 00:43:54 UTC (rev 123269)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py	2011-11-03 03:05:05 UTC (rev 123270)
@@ -21,6 +21,7 @@
 from DateTime.DateTime import DateTime
 from Products.PluginIndexes.common import safe_callable
 from Products.ZCatalog.ZCatalog import ZCatalog
+from Products.ZCatalog.Catalog import _deprecated
 from zope import interface
 from zope.interface import implements
 from zope import component
@@ -57,7 +58,6 @@
         if inst is None:
             return getObjectSpecification(cls)
         else:
-            assert cls is not None
             obj = inst._IndexableObjectWrapper__ob
             provided = providedBy(obj)
             return Provides(
@@ -261,8 +261,8 @@
 
     manage_catalogFind = DTMLFile( 'catalogFind', _dtmldir )
 
-    def catalog_object(self, obj, idxs=None, update_metadata=1,
-                       pghandler=None):
+    def catalog_object(self, obj, uid=_deprecated, idxs=None,
+                       update_metadata=1, pghandler=None):
         # Wraps the object with workflow and accessibility
         # information just before cataloging.
         # XXX: this method violates the rules for tools/utilities:
@@ -275,9 +275,9 @@
                 # BBB
                 w = IndexableObjectWrapper(obj, self)
         ZCatalog.catalog_object(
-            self, w, idxs=idxs, update_metadata=update_metadata,
-            pghandler=pghandler)
-
+            self, w, uid=_deprecated, idxs=idxs,
+            update_metadata=update_metadata, pghandler=pghandler)
+        
     security.declarePrivate('indexObject')
     def indexObject(self, object):
         """Add to catalog.