From 56e464fe8eb274b95ccf91078cb16d498695219a Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Mon, 3 Jan 2011 13:13:30 +0000
Subject: [PATCH] Minor fixes for Python 3.1

git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils@6509 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 docutils/utils.py         |  6 +++---
 test/test_command_line.py | 23 +++++++++++++----------
 test/test_utils.py        |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docutils/utils.py b/docutils/utils.py
index 8fc4742d7..61cff5d16 100644
--- a/docutils/utils.py
+++ b/docutils/utils.py
@@ -594,15 +594,15 @@ def column_width(text):
 
     Correct ``len(text)`` for wide East Asian and combining Unicode chars.
     """
-    if isinstance(text, str):
+    if isinstance(text, str) and sys.version_info < (3,0):
         return len(text)
+    combining_correction = sum([-1 for c in text
+                                if unicodedata.combining(c)])
     try:
         width = sum([east_asian_widths[unicodedata.east_asian_width(c)]
                      for c in text])
     except AttributeError:  # east_asian_width() New in version 2.4.
         width = len(text)
-    combining_correction = sum([-1 for ch in text
-                                if unicodedata.combining(ch)])
     return width + combining_correction
 
 def uniq(L):
diff --git a/test/test_command_line.py b/test/test_command_line.py
index af57deeb8..a2201430c 100644
--- a/test/test_command_line.py
+++ b/test/test_command_line.py
@@ -16,12 +16,16 @@ import docutils.core
 import docutils.utils
 
 try:
+    import subprocess  # new in 2.4
+except ImportError:
+    argv_encoding = None
+try:
     import locale
     argv_encoding = locale.getpreferredencoding()
 except:
     argv_encoding = None
 
-testoutput = """\
+testoutput = u"""\
 <document source="<stdin>" title="Dornröschen">
     <decoration>
         <footer>
@@ -29,7 +33,7 @@ testoutput = """\
 """
 
 class CommandLineEncodingTests(unittest.TestCase):
-    
+
     # This does not work, as there is no "encoding" argument!
     # def test_argv_encoding(self):
     #     if argv_encoding is None:
@@ -38,19 +42,18 @@ class CommandLineEncodingTests(unittest.TestCase):
     #     if sys.argv:
     #         self.assertEqual(sys.argv[0].encoding,
     #                          locale.getpreferredencoding())
-    
+
     def test_argv_decoding(self):
         if argv_encoding is None:
-            # failure to load "locale" module
+            # failure to load "locale" or "subprocess" module
             return # nothing to test
         cmd_str = (u'../tools/rst2pseudoxml.py --no-generator '
                    u'--no-datestamp --title=Dornröschen')
-        # os.popen2 deprecated in Python 2.6 
-        # but the subprocess module is new in Python 2.4
-        (child_in, child_out) = os.popen2(cmd_str.encode(argv_encoding))
-        child_in.close()
-        output = child_out.read()
-        child_out.close()
+        p = subprocess.Popen([cmd_str.encode(argv_encoding)], shell=True,
+                             stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+        p.stdin.close()
+        output = p.stdout.read().decode(argv_encoding)
+        p.stdout.close()
         self.assertEqual(output, testoutput)
 
 if __name__ == '__main__':
diff --git a/test/test_utils.py b/test/test_utils.py
index e6bb723d7..224ae76fc 100755
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -225,7 +225,7 @@ class HelperFunctionsTests(unittest.TestCase):
                           'de_1901_frak', 'de_at', 'de_1901', 'de_frak', 'de'])
 
     def test_column_width(self):
-        self.assertEquals(utils.column_width('de'), 2)
+        self.assertEquals(utils.column_width(u'de'), 2)
         self.assertEquals(utils.column_width(u'dâ'), 2) # pre-composed
         self.assertEquals(utils.column_width(u'dâ'), 2) # combining
 
-- 
2.11.4.GIT