Test was wrong, sorry for the multiple commits.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16228 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/CatalogTool.py

@@ -716,9 +716,9 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool, ActiveObject):
           Remove from catalog.
         """
         if path is None and uid is None:
-          path = self.__url(object)
-        elif object is None:
+          if object is None:
             raise TypeError, 'One of uid, path and object parameters must not be None'
+          path = self.__url(object)
         self.uncatalog_object(path=path,uid=uid, sql_catalog_id=sql_catalog_id)
 
     security.declarePrivate('beforeUnindexObject')