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

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Oct 31 11:35:02 2007
New Revision: 17309

URL: http://svn.erp5.org?rev=17309&view=rev
Log:
Import ConflictError. This was forgoten in my previous patch.

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=17309&r1=17308&r2=17309&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Wed Oct 31 11:35:02 2007
@@ -26,6 +26,7 @@
 #
 ##############################################################################
 
+from ZODB.POSException import ConflictError
 from Products.CMFCore.CatalogTool import CatalogTool as CMFCoreCatalogTool
 from Products.ZSQLCatalog.ZSQLCatalog import ZCatalog
 from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery