[Zope-Checkins] SVN: Zope/trunk/lib/python/reStructuredText/ added more tests to document the behavior before the

[Andreas Jung]

Log message for revision 65937:
  added more tests to document the behavior before the
  next docutils upgrade
  

Changed:
  U   Zope/trunk/lib/python/reStructuredText/__init__.py
  U   Zope/trunk/lib/python/reStructuredText/tests/testReST.py

-=-
Modified: Zope/trunk/lib/python/reStructuredText/__init__.py
===================================================================
--- Zope/trunk/lib/python/reStructuredText/__init__.py	2006-03-12 23:29:08 UTC (rev 65936)
+++ Zope/trunk/lib/python/reStructuredText/__init__.py	2006-03-13 12:16:56 UTC (rev 65937)
@@ -152,6 +152,9 @@
 
     warnings = ''.join(warning_stream.messages)
 
-    return output.encode(output_encoding)
+    if output_encoding != 'unicode':
+        return output.encode(output_encoding)
+    else:
+        return output
 
 __all__ = ("HTML", 'render')

Modified: Zope/trunk/lib/python/reStructuredText/tests/testReST.py
===================================================================
--- Zope/trunk/lib/python/reStructuredText/tests/testReST.py	2006-03-12 23:29:08 UTC (rev 65936)
+++ Zope/trunk/lib/python/reStructuredText/tests/testReST.py	2006-03-13 12:16:56 UTC (rev 65937)
@@ -1,14 +1,70 @@
+# -*- coding: iso-8859-15 -*-
 
 import unittest
 
+from reStructuredText import HTML
 
+
+txt = """Hello World
+============
+
+text text
+
+Von Vögeln und Öfen
+===================
+
+- some
+- more
+- text
+
+"""
+
+
 class TestReST(unittest.TestCase):
 
     def testRoman(self):
         # Make sure we can import the rst parser
         from docutils.parsers import rst
 
+    def testEncodings(self):
 
+        def _test(txt, in_enc, out_enc):
+            return HTML(txt,
+                        input_encoding=in_enc,
+                        output_encoding=out_enc)
+
+        encoding = 'iso-8859-15'
+        html = _test(txt, encoding, encoding)
+        self.assertEqual('Vögel' in html, True)
+        self.assertEqual('Öfen' in html, True)
+
+        html = _test(txt, encoding, 'unicode')
+        self.assertEqual(unicode('Vögel', encoding) in html, True)
+        self.assertEqual(unicode('Öfen', encoding) in html, True)
+
+        html = _test(unicode(txt, encoding), 'unicode', encoding)
+        self.assertEqual('Vögel' in html, True)
+        self.assertEqual('Öfen' in html, True)
+
+        html = _test(unicode(txt, encoding), 'unicode', 'unicode')
+        self.assertEqual(unicode('Vögel', encoding) in html, True)
+        self.assertEqual(unicode('Öfen', encoding) in html, True)
+
+    def testHeaderLevel(self):
+
+        encoding = 'iso-8859-15'
+        for level in range(0, 5):
+            html = HTML(txt, input_encoding=encoding, 
+                             output_encoding=encoding, 
+                             initial_header_level=level)
+            self.assertEqual('<h%d><a name="hello-world">Hello World</a></h%d>'\
+                              % (level+1, level+1) in html,
+                             True)
+            self.assertEqual('<h%d><a name="von-v-geln-und-fen">Von Vögeln und Öfen</a></h%d>'\
+                              % (level+1, level+1) in html,
+                             True)
+        
+
 def test_suite():
     from unittest import TestSuite, makeSuite
     return TestSuite((makeSuite(TestReST),))