[Zope-Checkins] CVS: Zope/lib/python/Products/ZReST - ZReST.py:1.1.2.3

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/ZReST
In directory cvs.zope.org:/tmp/cvs-serv5730

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	ZReST.py 
Log Message:
update from RIchards sandbox


=== Zope/lib/python/Products/ZReST/ZReST.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/lib/python/Products/ZReST/ZReST.py:1.1.2.2	Wed Nov  6 11:09:36 2002
+++ Zope/lib/python/Products/ZReST/ZReST.py	Thu Jan 30 13:09:44 2003
@@ -158,7 +158,7 @@
         '''
         # format with strings
         pub = docutils.core.Publisher()
-        pub.set_reader('restructuredtext', None, 'restructuredtext')
+        pub.set_reader('standalone', None, 'restructuredtext')
         pub.set_writer('html')
 
         # go with the defaults
@@ -180,11 +180,12 @@
         pub.settings.warning_stream = Warnings()
 
         # input
-        pub.source = docutils.io.StringInput(pub.settings)
-        pub.source.source = self.source
+        pub.source = docutils.io.StringInput(
+            source=self.source, encoding=pub.settings.input_encoding)
 
         # output - not that it's needed
-        pub.destination = docutils.io.StringOutput(pub.settings)
+        pub.destination = docutils.io.StringOutput(
+            encoding=pub.settings.output_encoding)
 
         # parse!
         document = pub.reader.read(pub.source, pub.parser, pub.settings)
@@ -264,8 +265,14 @@
 
 #
 # $Log$
-# Revision 1.1.2.2  2002/11/06 16:09:36  andreasjung
-# updated to ZReST 1.1
+# Revision 1.1.2.3  2003/01/30 18:09:44  andreasjung
+# update from RIchards sandbox
+#
+# Revision 1.6  2002/11/28 03:44:50  goodger
+# updated
+#
+# Revision 1.5  2002/11/05 05:27:56  goodger
+# fixed Reader name
 #
 # Revision 1.4  2002/10/18 05:10:33  goodger
 # Refactored names (options -> settings; etc.); updated.