Merge commit 'a4cb4d96face514924387d34746b3148848ac092' into zope-2.13

[Plinn.git] / __init__.py

diff --git a/__init__.py b/__init__.py
index df0ca9b..16c9e72 100755 (executable)
--- a/__init__.py
+++ b/__init__.py
@@ -38,11 +38,9 @@ import GroupDataTool
 import RegistrationTool
 import CalendarTool
 import AttachmentTool
-#from shutdown_dispatcher import ZopeShutdownDispatcher
+import catalog
 
 from PloneMisc import IndexIterator, Batch
-from utils import  getCPInfo, popCP
-
 import patch
 
 from AccessControl import allow_module, allow_class
@@ -59,18 +57,13 @@ tools = ( MembershipTool.MembershipTool
                , RegistrationTool.RegistrationTool
                , CalendarTool.CalendarTool
                , AttachmentTool.AttachmentTool
+               , catalog.CatalogTool
                )
 
-methods = {
-'getCPInfo': getCPInfo,
-'getCPInfo__roles__': None,
-'popCP' : popCP,
-'popCP__roles__' : None
-}
-
-# register font extensions
+# register files extensions
 registerFileExtension('ttf', FSFile)
 registerFileExtension('eot', FSFile)
+registerFileExtension('cur', FSFile)
 
 def initialize(registrar) :
        
@@ -78,8 +71,6 @@ def initialize(registrar) :
        allow_module('Products.Plinn.PloneMisc')
        allow_class(IndexIterator)
        allow_class(Batch)
-       app = registrar._ProductContext__app
-       #ZopeShutdownDispatcher(registrar._ProductContext__app)
        
        core_cmf_utils.ContentInit(
        'Plinn',