[Zope-Checkins] CVS: Zope/lib/python/reStructuredText - __init__.py:1.7.2.2

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/reStructuredText
In directory cvs.zope.org:/tmp/cvs-serv29570/lib/python/reStructuredText

Modified Files:
      Tag: Zope-2_7-branch
	__init__.py 
Log Message:
reST ignored the encoding settings in zope.conf


=== Zope/lib/python/reStructuredText/__init__.py 1.7.2.1 => 1.7.2.2 ===
--- Zope/lib/python/reStructuredText/__init__.py:1.7.2.1	Sun Nov 30 11:08:34 2003
+++ Zope/lib/python/reStructuredText/__init__.py	Tue Mar 23 01:57:22 2004
@@ -15,14 +15,14 @@
 
 __all__ = ("HTML", ) 
 
-import docutils.core 
-from docutils.io import StringOutput, StringInput 
 import sys, os
+import docutils.core 
+from docutils.io import StringOutput, StringInput
+from App.config import getConfiguration 
 
-default_input_encoding = os.environ.get("REST_INPUT_ENCODING", 
-                                        sys.getdefaultencoding())
-default_output_encoding = os.environ.get("REST_OUTPUT_ENCODING", 
-                                         sys.getdefaultencoding())
+default_enc = sys.getdefaultencoding()
+default_output_encoding = getConfiguration().rest_output_encoding or default_enc
+default_input_encoding = getConfiguration().rest_input_encoding or default_enc
 
 class Warnings:
 
@@ -32,7 +32,6 @@
     def write(self, message):
         self.messages.append(message)
 
-
 def HTML(src, 
          writer='html4zope', 
          report_level=1, 
@@ -92,8 +91,6 @@
 
     # do the format
     return pub.writer.write(document, pub.destination)
-
-
 
 from docutils import writers
 import html4zope