[Docutils-checkins] r6320 - in trunk/docutils/test: DocutilsTestSupport.py test_readers/test_python/test_functions.py

[<mi...@us...>]

Author: milde
Date: 2010-05-07 10:16:56 +0200 (Fri, 07 May 2010)
New Revision: 6320

Modified:
   trunk/docutils/test/DocutilsTestSupport.py
   trunk/docutils/test/test_readers/test_python/test_functions.py
Log:
fix testing under py3k

Modified: trunk/docutils/test/DocutilsTestSupport.py
===================================================================
--- trunk/docutils/test/DocutilsTestSupport.py	2010-05-05 12:08:10 UTC (rev 6319)
+++ trunk/docutils/test/DocutilsTestSupport.py	2010-05-07 08:16:56 UTC (rev 6320)
@@ -195,9 +195,9 @@
             # API difference: Python 3's node.__str__ doesn't escape
             #assert expected is None or isinstance(expected, unicode)
             if isinstance(expected, bytes):
-                expected = expected.decode('ascii')
+                expected = expected.decode('utf-8')
             if isinstance(output, bytes):
-                output = output.decode('ascii')
+                output = output.decode('utf-8')
         else:
             if isinstance(expected, unicode):
                 expected = expected.encode('raw_unicode_escape')

Modified: trunk/docutils/test/test_readers/test_python/test_functions.py
===================================================================
--- trunk/docutils/test/test_readers/test_python/test_functions.py	2010-05-05 12:08:10 UTC (rev 6319)
+++ trunk/docutils/test/test_readers/test_python/test_functions.py	2010-05-07 08:16:56 UTC (rev 6320)
@@ -10,10 +10,7 @@
 
 import unittest
 from __init__ import DocutilsTestSupport
-try:
-    from docutils.readers.python.moduleparser import trim_docstring
-except ImportError: # `compiler` module dropped from py3k
-    pass
+from docutils.readers.python.moduleparser import trim_docstring
 
 
 class MiscTests(unittest.TestCase):