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

[Yvo Schubbe]

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

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/Document.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-07-01 12:12:01 UTC (rev 87880)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-07-01 12:12:28 UTC (rev 87881)
@@ -1,6 +1,9 @@
 Products.CMFDefault Changelog
 
   Products.CMFDefault 2.2.0 (unreleased)
+  
+    - Document: Fixed Zope 2.12 compatibility.
+      zope.structuredtext is now used instead of StructuredText.
 
     - Image, File:  make ZMI "edit" view work.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Document.py	2008-07-01 12:12:01 UTC (rev 87880)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Document.py	2008-07-01 12:12:28 UTC (rev 87881)
@@ -28,11 +28,11 @@
     REST_AVAILABLE = True
 except ImportError:
     REST_AVAILABLE = False
-from StructuredText.StructuredText import HTML
    
 from zope.component import queryUtility
 from zope.component.factory import Factory
 from zope.interface import implements
+from zope.structuredtext import stx2html
 
 from Products.CMFCore.interfaces import ILinebreakNormalizer
 from Products.CMFCore.PortalContent import PortalContent
@@ -132,7 +132,7 @@
         elif text_format == 'restructured-text':
             self.cooked_text = ReST(text, initial_header_level=self._rest_level)
         else:
-            self.cooked_text = HTML(text, level=self._stx_level, header=0)
+            self.cooked_text = stx2html(text, level=self._stx_level, header=0)
 
     #
     #   IMutableDocument method
@@ -320,7 +320,7 @@
                 self.cooked_text = cooked
             return cooked
         else:
-            cooked = HTML(self.text, level=stx_level, header=0)
+            cooked = stx2html(self.text, level=stx_level, header=0)
             if setlevel:
                 self._stx_level = stx_level
                 self.cooked_text = cooked