SVN: Zope/trunk/ Removed `Products.ZReST` and the `reStructuredText` wrapper, you can use `docutils` directly to gain `reST` support.

Log message for revision 122076:
  Removed `Products.ZReST` and the `reStructuredText` wrapper, you can use `docutils` directly to gain `reST` support.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/App/config.py
  D   Zope/trunk/src/Products/ZReST/
  U   Zope/trunk/src/Zope2/Startup/handlers.py
  U   Zope/trunk/src/Zope2/Startup/zopeschema.xml
  D   Zope/trunk/src/reStructuredText/

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2011-07-03 13:17:35 UTC (rev 122075)
+++ Zope/trunk/doc/CHANGES.rst	2011-07-03 13:29:38 UTC (rev 122076)
@@ -41,6 +41,9 @@
 Restructuring
 +++++++++++++
 
+- Removed `Products.ZReST` and the `reStructuredText` wrapper, you can use
+  `docutils` directly to gain `reST` support.
+
 - Removed special code to create user folders and page templates while creating
   new `OFS.Folder` instances.
 

Modified: Zope/trunk/src/App/config.py
===================================================================
--- Zope/trunk/src/App/config.py	2011-07-03 13:17:35 UTC (rev 122075)
+++ Zope/trunk/src/App/config.py	2011-07-03 13:29:38 UTC (rev 122076)
@@ -12,14 +12,6 @@
 #
 ##############################################################################
 
-"""Simple access to configuration values.
-
-The configuration values are represented as a single object with
-attributes for each bit of information.
-"""
-
-import sys
-
 _config = None
 
 def getConfiguration():
@@ -89,13 +81,6 @@
         self.enable_product_installation = False
         self.locale = None
 
-        # restructured text
-        default_enc = sys.getdefaultencoding()
-        self.rest_input_encoding = default_enc
-        self.rest_output_encoding = default_enc
-        self.rest_header_level = 3
-        self.rest_language_code = 'en'
-
         # ZServer.HTTPServer
         self.http_header_max_length = 8196
 

Modified: Zope/trunk/src/Zope2/Startup/handlers.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/handlers.py	2011-07-03 13:17:35 UTC (rev 122075)
+++ Zope/trunk/src/Zope2/Startup/handlers.py	2011-07-03 13:29:38 UTC (rev 122076)
@@ -61,26 +61,6 @@
     value and _setenv('SUPPRESS_SITEROOT', value)
     return value
 
-def structured_text_header_level(value):
-    value is not None and _setenv('STX_DEFAULT_LEVEL', value)
-    return value
-
-def rest_input_encoding(value):
-    value and _setenv('REST_INPUT_ENCODING' , value)
-    return value
-
-def rest_output_encoding(value):
-    value and _setenv('REST_OUTPUT_ENCODING' , value)
-    return value
-
-def rest_header_level(value):
-    value and _setenv('REST_DEFAULT_LEVEL' , value)
-    return value
-
-def rest_language_code(value):
-    value and _setenv('REST_LANGUAGE_CODE' , value)
-    return value
-
 def large_file_threshold(value):
     import ZServer
     ZServer.LARGE_FILE_THRESHOLD = value

Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml
===================================================================
--- Zope/trunk/src/Zope2/Startup/zopeschema.xml	2011-07-03 13:17:35 UTC (rev 122075)
+++ Zope/trunk/src/Zope2/Startup/zopeschema.xml	2011-07-03 13:29:38 UTC (rev 122076)
@@ -472,53 +472,6 @@
     </description>
   </key>
 
-  <key name="structured-text-header-level" datatype="integer" default="3"
-       handler="structured_text_header_level">
-    <description>
-     Set the default starting HTML header level for structured text
-     documents. The default is 3, which implies that top-level headers
-     will be created with an H3 HTML tag.
-    </description>
-    <metadefault>3</metadefault>
-  </key>
-
-  <key name="rest-input-encoding" handler="rest_input_encoding">
-    <description>
-    Specifies the input encoding of re-StructuredText documents
-    (e.g. 'utf-8', 'iso-8859' or any other valid encoding recognized
-    by Python).  The default is your Python's default encoding.
-    </description>
-    <metadefault>unset</metadefault>
-  </key>
-
-  <key name="rest-output-encoding" handler="rest_output_encoding">
-    <description>
-    Specifies the output encoding of re-StructuredText documents
-    (e.g. 'utf-8', 'iso-8859' or any other valid encoding recognized
-    by Python).  The default is your Python's default encoding.
-    </description>
-    <metadefault>unset</metadefault>
-  </key>
-
-  <key name="rest-header-level" datatype="integer" default="3"
-       handler="rest_header_level">
-    <description>
-     Set the default starting HTML header level for restructured text
-     documents. The default is 3, which implies that top-level headers
-     will be created with an H3 HTML tag.
-    </description>
-    <metadefault>3</metadefault>
-  </key>
-
-  <key name="rest-language-code" handler="rest_language_code" default="en">
-    <description>
-     Language code used for some internal translations inside of the docutils
-     package and for DTD bibliographic elements mapping. See
-     lib/python/docutils/languages/ for a list of supported language codes.
-    </description>
-    <metadefault>en</metadefault>
-  </key>
-
   <key name="publisher-profile-file">
     <description>
      Causing this directive to point to a file on the filesystem will

_______________________________________________
Zope-Checkins maillist  -  [email protected]
https://mail.zope.org/mailman/listinfo/zope-checkins