[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - StructuredText no longer exists on Zope trunk

[Yvo Schubbe]

Log message for revision 87880:
  - StructuredText no longer exists on Zope trunk

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-07-01 10:17:13 UTC (rev 87879)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2008-07-01 12:12:01 UTC (rev 87880)
@@ -2,6 +2,9 @@
 
   Products.CMFCore 2.2.0 (unreleased)
 
+    - FSSTXMethod: Fixed Zope 2.12 compatibility.
+      zope.structuredtext is now used instead of StructuredText.
+
     - removed the five.localsitemanager svn:external and its import hack
       in favor of stating the dependency for separate installation in
       DEPENDENCIES.txt and automatic installation in setup.py.

Modified: Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py	2008-07-01 10:17:13 UTC (rev 87879)
+++ Products.CMFCore/trunk/Products/CMFCore/FSSTXMethod.py	2008-07-01 12:12:01 UTC (rev 87880)
@@ -21,8 +21,8 @@
 from Globals import DTMLFile
 from Globals import InitializeClass
 from OFS.DTMLDocument import DTMLDocument
-from StructuredText.StructuredText import HTML as STX_HTML
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
+from zope.structuredtext import stx2html
 
 from Products.CMFCore.DirectoryView import registerFileExtension
 from Products.CMFCore.DirectoryView import registerMetaType
@@ -143,7 +143,7 @@
 
     def cook(self):
         if not hasattr(self, '_v_cooked'):
-            self._v_cooked = STX_HTML(self.raw, level=1, header=0)
+            self._v_cooked = stx2html(self.raw, level=1, header=0)
         return self._v_cooked
 
     _default_DTML_template = DTML_HTML(_DEFAULT_TEMPLATE_DTML)