[Erp5-report] r16228 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Sep 10 16:23:40 2007
New Revision: 16228

URL: http://svn.erp5.org?rev=16228&view=rev
Log:
Test was wrong, sorry for the multiple commits.

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=16228&r1=16227&r2=16228&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Mon Sep 10 16:23:40 2007
@@ -716,9 +716,9 @@
           Remove from catalog.
         """
         if path is None and uid is None:
+          if object is None:
+            raise TypeError, 'One of uid, path and object parameters must not be None'
           path = self.__url(object)
-        elif object is None:
-          raise TypeError, 'One of uid, path and object parameters must not be None'
         self.uncatalog_object(path=path,uid=uid, sql_catalog_id=sql_catalog_id)
 
     security.declarePrivate('beforeUnindexObject')