[Zope-Checkins] CVS: Zope/lib/python/App - config.py:1.4.2.6

[Christian 'Tiran' Heimes]

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

Modified Files:
      Tag: Zope-2_7-branch
	config.py 
Log Message:
Added a render() method to reStructuredText which returns the rendered parts and the warning object
Added default configuration values to App.config


=== Zope/lib/python/App/config.py 1.4.2.5 => 1.4.2.6 ===
--- Zope/lib/python/App/config.py:1.4.2.5	Fri Mar 19 07:32:12 2004
+++ Zope/lib/python/App/config.py	Fri May 14 10:54:51 2004
@@ -18,6 +18,8 @@
 attributes for each bit of information.
 """
 
+import sys
+
 _config = None
 
 def getConfiguration():
@@ -60,7 +62,6 @@
     os.environ["SOFTWARE_HOME"] = cfg.softwarehome
     os.environ["ZOPE_HOME"] = cfg.zopehome
 
-    import sys
     if "Globals" in sys.modules:
         # XXX We *really* want to avoid this if Globals hasn't already
         # been imported, due to circular imports.  ;-(
@@ -85,3 +86,9 @@
         self.dbtab = None
         self.debug_mode = True
         self.enable_product_installation = True
+        
+        # restructured text
+        default_enc = sys.getdefaultencoding()
+        self.rest_input_encoding = default_enc
+        self.rest_output_encoding = default_enc
+        self.rest_header_level = 3