Log message for revision 41186: replace StructuredText with zope.structuredtext
Changed: U Zope/trunk/lib/python/HelpSys/APIHelpTopic.py U Zope/trunk/lib/python/HelpSys/HelpUtil.py U Zope/trunk/lib/python/HelpSys/ObjectRef.py -=- Modified: Zope/trunk/lib/python/HelpSys/APIHelpTopic.py =================================================================== --- Zope/trunk/lib/python/HelpSys/APIHelpTopic.py 2006-01-07 14:34:38 UTC (rev 41185) +++ Zope/trunk/lib/python/HelpSys/APIHelpTopic.py 2006-01-07 14:57:15 UTC (rev 41186) @@ -126,7 +126,6 @@ # Get info on methods and attributes, ignore special items self.attributes=[] self.methods=[] - from Interface.Method import Method for k,v in klass.namesAndDescriptions(): if hasattr(v, 'getSignatureInfo'): self.methods.append(MethodDoc(v, 1)) Modified: Zope/trunk/lib/python/HelpSys/HelpUtil.py =================================================================== --- Zope/trunk/lib/python/HelpSys/HelpUtil.py 2006-01-07 14:34:38 UTC (rev 41185) +++ Zope/trunk/lib/python/HelpSys/HelpUtil.py 2006-01-07 14:57:15 UTC (rev 41186) @@ -15,14 +15,12 @@ __version__='$Revision: 1.12 $'[11:-2] +import sys, re import Globals, Acquisition -import StructuredText.StructuredText -import sys, os, re +from zope.structuredtext.html import HTMLWithImages +from zope.structuredtext.document import DocumentWithImages -stx_class=StructuredText.StructuredText.HTML - - class HelpBase(Acquisition.Implicit): """ """ def __bobo_traverse__(self, REQUEST, name=None): @@ -76,8 +74,11 @@ doc[1]=doc[1].strip() doc='\n\n'.join(doc) - return str(stx_class(doc)) + doc = DocumentWithImages()(doc) + return HTMLWithImages()(doc) + + def version(self): if hasattr(self._obj_, '__version__'): return self._obj_.__version__ Modified: Zope/trunk/lib/python/HelpSys/ObjectRef.py =================================================================== --- Zope/trunk/lib/python/HelpSys/ObjectRef.py 2006-01-07 14:34:38 UTC (rev 41185) +++ Zope/trunk/lib/python/HelpSys/ObjectRef.py 2006-01-07 14:57:15 UTC (rev 41186) @@ -17,7 +17,7 @@ from Globals import InitializeClass from AccessControl import ClassSecurityInfo -import sys, os, Globals, Acquisition +import sys, Globals from HelpUtil import HelpBase, classobject from HelpUtil import is_class, is_module from Globals import DTMLFile _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins