Revert c81408 HelpSys changes, it didn't make much of a difference. Making the...

Revert c81408 HelpSys changes, it didn't make much of a difference. Making the whole help system optional would be a better approach.

doc/CHANGES.txt

@@ -9,9 +9,6 @@ Zope Changes
 
     Restructuring
 
-      - Made Helpsys.HelpSys internal ZCatalog creation lazy, so it isn't
-        created unless first accessed.
-
       - Turned deprecation warnings for manage_afterAdd, manage_beforeDelete
         and manage_afterClone methods into discouraged warnings. These methods
         will not be removed in Zope 2.11, but stay for the foreseeable future.

lib/python/HelpSys/HelpSys.py

@@ -219,26 +219,20 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent):
     def __init__(self, id='Help', title=''):
         self.id=id
         self.title=title
-        self._catalog = None
-
-    @property
-    def catalog(self):
-        if self._catalog is None:
-            c=self._catalog=ZCatalog('catalog')
-            # clear catalog
-            for index in c.indexes():
-                c.delIndex(index)
-            for col in c.schema():
-                c.delColumn(col)
-            c.addIndex('SearchableText', 'TextIndex')
-            c.addIndex('categories', 'KeywordIndex')
-            c.addIndex('permissions', 'KeywordIndex')
-            c.addColumn('categories')
-            c.addColumn('permissions')
-            c.addColumn('title_or_id')
-            c.addColumn('url')
-            c.addColumn('id')
-        return self._catalog
+        c=self.catalog=ZCatalog('catalog')
+        # clear catalog
+        for index in c.indexes():
+            c.delIndex(index)
+        for col in c.schema():
+            c.delColumn(col)
+        c.addIndex('SearchableText', 'TextIndex')
+        c.addIndex('categories', 'KeywordIndex')
+        c.addIndex('permissions', 'KeywordIndex')
+        c.addColumn('categories')
+        c.addColumn('permissions')
+        c.addColumn('title_or_id')
+        c.addColumn('url')
+        c.addColumn('id')
 
     security.declareProtected(add_documents_images_and_files, 'addTopicForm')
     addTopicForm=DTMLFile('dtml/addTopic', globals())