py3: Add aliases for removed symbols

Add aliases for symbols that have been removed in Python 3.x, namely
basestring, unicode, unichr and StandardError.

Signed-off-by: Stephen Finucane <stephen@that.guru>
small fixes by Günter Milde.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8348 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

8 files changed, 35 insertions, 2 deletions

diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index b26fc44d8..eb9b8fa39 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -89,6 +89,10 @@ except:
     import pdb
 
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+
+
 # Hack to make repr(StringList) look like repr(list):
 StringList.__repr__ = StringList.__str__
 
diff --git a/docutils/test/test__init__.py b/docutils/test/test__init__.py
index f23c1f201..c66f97a02 100644
--- a/docutils/test/test__init__.py
+++ b/docutils/test/test__init__.py
@@ -16,6 +16,10 @@ import docutils
 import docutils.utils
 
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+
+
 class ApplicationErrorTests(unittest.TestCase):
 
     def test_message(self):
diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py
index 400e40ad7..41dbfc5df 100644
--- a/docutils/test/test_error_reporting.py
+++ b/docutils/test/test_error_reporting.py
@@ -44,6 +44,9 @@ if sys.version_info < (3, 0):  # problems solved in py3k
         print('cannot test error reporting with problematic locales,\n'
               '`import locale` failed.')
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+
 
 # locales confirmed to use non-ASCII chars in the IOError message
 # for a missing file (https://bugs.gentoo.org/show_bug.cgi?id=349101)
diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py
index 69fb36c0f..920d1b4e9 100755
--- a/docutils/test/test_language.py
+++ b/docutils/test/test_language.py
@@ -26,6 +26,9 @@ _reporter = docutils.utils.new_reporter('', _settings)
 
 reference_language = 'en'
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+
 
 class LanguageTestSuite(DocutilsTestSupport.CustomTestSuite):
 
@@ -156,7 +159,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase):
         if failures:
             text = ('Module docutils.parsers.rst.languages.%s:\n    %s'
                     % (self.language, '\n    '.join(failures)))
-            if type(text) is unicode:
+            if isinstance(text, unicode):
                 text = text.encode('raw_unicode_escape')
             self.fail(text)
 
@@ -191,7 +194,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase):
         if failures:
             text = ('Module docutils.parsers.rst.languages.%s:\n    %s'
                     % (self.language, '\n    '.join(failures)))
-            if type(text) is unicode:
+            if isinstance(text, unicode):
                 text = text.encode('raw_unicode_escape')
             self.fail(text)
 
diff --git a/docutils/test/test_nodes.py b/docutils/test/test_nodes.py
index 1badfd391..84da41f2c 100755
--- a/docutils/test/test_nodes.py
+++ b/docutils/test/test_nodes.py
@@ -17,6 +17,9 @@ from DocutilsTestSupport import nodes, utils
 
 debug = False
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+
 
 class TextTests(unittest.TestCase):
 
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_include.py b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
index 3dc775f3c..acd31e00b 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_include.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_include.py
@@ -14,6 +14,11 @@ from __init__ import DocutilsTestSupport
 from docutils.parsers.rst import states
 from docutils.utils.code_analyzer import with_pygments
 
+
+if sys.version_info >= (3, 0):
+    unichr = chr  # noqa
+
+
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
     if not with_pygments:
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
index a6a02f5fb..b187df32f 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_tables.py
@@ -17,6 +17,11 @@ import platform
 from docutils.parsers.rst.directives import tables
 
 
+if sys.version_info >= (3, 0):
+    unicode = str  # noqa
+    unichr = chr  # noqa
+
+
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
     s.generateTests(totest)
diff --git a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
index 54ad6ff29..2d341d58a 100755
--- a/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
+++ b/docutils/test/test_parsers/test_rst/test_directives/test_unicode.py
@@ -8,9 +8,15 @@
 Tests for misc.py "unicode" directive.
 """
 
+import sys
+
 from __init__ import DocutilsTestSupport
 
 
+if sys.version_info >= (3, 0):
+    unichr = chr  # noqa
+
+
 def suite():
     s = DocutilsTestSupport.ParserTestSuite()
     s.generateTests(totest)