[Zope-Checkins] CVS: Zope2 - Product.py:1.48.10.1 ProductContext.py:1.31.30.1

Michel Pelletier michel@digicool.com
Thu, 17 May 2001 14:51:35 -0400 (EDT)


Update of /cvs-repository/Zope2/lib/python/App
In directory korak.digicool.com:/tmp/cvs-serv11742/lib/python/App

Modified Files:
      Tag: APIDocs-branch
	Product.py ProductContext.py 
Log Message:
fixed category bug


--- Updated File Product.py in package Zope2 --
--- Product.py	2001/04/27 18:07:08	1.48
+++ Product.py	2001/05/17 18:51:04	1.48.10.1
@@ -115,7 +115,7 @@
 from Factory import Factory
 from Permission import PermissionManager
 import ZClasses, ZClasses.ZClass
-from HelpSys.HelpSys import ProductHelp
+from HelpSys.ProductHelp import ProductHelp
 
 
 class ProductFolder(Folder):

--- Updated File ProductContext.py in package Zope2 --
--- ProductContext.py	2001/03/27 03:18:08	1.31
+++ ProductContext.py	2001/05/17 18:51:04	1.31.30.1
@@ -88,7 +88,7 @@
 import Globals, os, OFS.ObjectManager, OFS.misc_, Products
 import AccessControl.Permission
 from HelpSys import HelpTopic, APIHelpTopic
-from HelpSys.HelpSys import ProductHelp
+from HelpSys.ProductHelp import ProductHelp
 from FactoryDispatcher import FactoryDispatcher
 from zLOG import LOG, WARNING
 import string, os.path, re
@@ -373,7 +373,10 @@
             elif ext in ('.jpg', '.gif', '.png'):
                 ht=HelpTopic.ImageTopic(file, '', os.path.join(path, file))
                 self.registerHelpTopic(file, ht)
-            elif ext in ('.py',):
+            elif ext in ('.py',) and file!='__init__.py':
                 ht=APIHelpTopic.APIHelpTopic(file, '', os.path.join(path, file))
                 self.registerHelpTopic(file, ht)
             
+
+
+