[Erp5-report] r33422 jp - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: jp
Date: Fri Mar  5 08:22:03 2010
New Revision: 33422

URL: http://svn.erp5.org?rev=33422&view=rev
Log:
Make SQLCatalog an ActiveObject, yet in a way which does not require to depend on CMFActivity.

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=33422&r1=33421&r2=33422&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Fri Mar  5 08:22:03 2010
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 # Copyright (c) 2002-2009 Nexedi SARL. All Rights Reserved.
@@ -53,6 +54,13 @@
 
 from SearchText import isAdvancedSearchText
 
+# Try to import ActiveObject in order to make SQLCatalog active
+try:
+  from Products.CMFActivity.ActiveObject import ActiveObject
+except ImportError:
+  ActiveObject = ExtensionClass.Base 
+
+
 PROFILING_ENABLED = False
 if PROFILING_ENABLED:
   from tiny_profiler import profiler_decorator, profiler_report, profiler_reset
@@ -233,7 +241,7 @@
 class Catalog(Folder,
               Persistent,
               Acquisition.Implicit,
-              ExtensionClass.Base,
+              ActiveObject,
               OFS.History.Historical):
   """ An Object Catalog