Commit 52e09e77 authored by Jean-Paul Smets's avatar Jean-Paul Smets

Make SQLCatalog an ActiveObject, yet in a way which does not require to depend on CMFActivity.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33422 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c437f3c4
# -*- coding: utf-8 -*-
############################################################################## ##############################################################################
# #
# Copyright (c) 2002-2009 Nexedi SARL. All Rights Reserved. # Copyright (c) 2002-2009 Nexedi SARL. All Rights Reserved.
...@@ -53,6 +54,13 @@ from zope.interface import implements ...@@ -53,6 +54,13 @@ from zope.interface import implements
from SearchText import isAdvancedSearchText 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 PROFILING_ENABLED = False
if PROFILING_ENABLED: if PROFILING_ENABLED:
from tiny_profiler import profiler_decorator, profiler_report, profiler_reset from tiny_profiler import profiler_decorator, profiler_report, profiler_reset
...@@ -233,7 +241,7 @@ related_key_warned_column_set = set() ...@@ -233,7 +241,7 @@ related_key_warned_column_set = set()
class Catalog(Folder, class Catalog(Folder,
Persistent, Persistent,
Acquisition.Implicit, Acquisition.Implicit,
ExtensionClass.Base, ActiveObject,
OFS.History.Historical): OFS.History.Historical):
""" An Object Catalog """ An Object Catalog
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment