Drop support for Python 3.3

This doesn't involve a whole lot of changes, but references to Python
3.3 (plus some to the already removed Python 2.6) are removed and
'setup.py' is updated as necessary.

Signed-off-by: Stephen Finucane <stephen@that.guru>

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

4 files changed, 15 insertions, 22 deletions

diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py
index 845927ca7..d62e6dbad 100644
--- a/docutils/test/test_error_reporting.py
+++ b/docutils/test/test_error_reporting.py
@@ -27,7 +27,6 @@ unless the minimal required Python version has this problem fixed.
 
 import unittest
 import sys, os
-import codecs
 from io import StringIO, BytesIO
 
 import DocutilsTestSupport              # must be imported before docutils
@@ -35,15 +34,13 @@ from docutils import core, parsers, frontend, utils
 from docutils.utils.error_reporting import SafeString, ErrorString, ErrorOutput
 
 oldlocale = None
-if sys.version_info < (3,0): # problems solved in py3k
+if sys.version_info < (3, 0):  # problems solved in py3k
     try:
-        import locale # module missing in Jython
+        import locale  # module missing in Jython
         oldlocale = locale.getlocale()
-        # Why does getlocale return the defaultlocale in Python 3.2 ????
-        # oldlocale = (None, None) # test suite runs without locale
     except ImportError:
         print ('cannot test error reporting with problematic locales,\n'
-            '`import locale` failed.')
+               '`import locale` failed.')
 
 
 # locales confirmed to use non-ASCII chars in the IOError message
@@ -81,8 +78,6 @@ class SafeStringTests(unittest.TestCase):
     us = u'\xfc'       # bytes(us) fails; str(us) fails in Python 2
     be = Exception(bs) # unicode(be) fails
     ue = Exception(us) # bytes(ue) fails, str(ue) fails in Python 2;
-                       # unicode(ue) fails in Python < 2.6 (issue2517_)
-                       # .. _issue2517: http://bugs.python.org/issue2517
     # wrapped test data:
     wbs = SafeString(bs)
     wus = SafeString(us)
@@ -114,7 +109,7 @@ class SafeStringTests(unittest.TestCase):
         self.assertEqual(unicode(self.us), unicode(self.wus))
         # unicode(self.be) fails
         self.assertEqual(unicode, type(unicode(self.wbe)))
-        # unicode(ue) fails in Python < 2.6 (issue2517_)
+        self.assertEqual(unicode, type(unicode(self.ue)))
         self.assertEqual(unicode, type(unicode(self.wue)))
         self.assertEqual(self.us, unicode(self.wue))
 
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 ed11b3ab2..a6a02f5fb 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
@@ -10,7 +10,8 @@ Tests for tables.py directives.
 
 from __init__ import DocutilsTestSupport
 
-import os, sys
+import os
+import sys
 import csv
 import platform
 from docutils.parsers.rst.directives import tables
@@ -33,21 +34,20 @@ if isinstance(unichr_exception, OverflowError):
 else:
     unichr_exception_string = str(unichr_exception)
 
-# some error messages changed in Python 3.3:
-# CPython has backported to 2.7.4, PyPy has not
-# platform.python_implementation is new in 2.6
+# some error messages changed in Python 3.3, CPython has backported to 2.7.4,
+# PyPy has not
 csv_eod_error_str = 'unexpected end of data'
 if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
     csv_eod_error_str = 'newline inside string'
 # pypy adds a line number
-if sys.version_info > (2, 6) and platform.python_implementation() == 'PyPy':
+if sys.version_info > (2, 7) and platform.python_implementation() == 'PyPy':
     csv_eod_error_str = 'line 1: ' + csv_eod_error_str
 csv_unknown_url = "'bogus.csv'"
-if sys.version_info < (3,3,2):
+if sys.version_info < (3, 0):
     csv_unknown_url = "bogus.csv"
 
+
 def null_bytes():
-    import csv
     with open(utf_16_csv, 'rb') as f:
         csv_data = f.read()
     csv_data = unicode(csv_data, 'latin1').splitlines()
diff --git a/docutils/test/test_utils.py b/docutils/test/test_utils.py
index 07b62e11a..1be74aad5 100755
--- a/docutils/test/test_utils.py
+++ b/docutils/test/test_utils.py
@@ -9,14 +9,11 @@
 Test module for utils/__init__.py.
 """
 
-import unittest
-import sys
+from io import StringIO
 import os
+import unittest
+
 from DocutilsTestSupport import docutils, utils, nodes
-try:
-    from io import StringIO
-except ImportError:    # io is new in Python 2.6
-    from StringIO import StringIO
 
 
 class ReporterTests(unittest.TestCase):
diff --git a/docutils/test/test_writers/test_odt.py b/docutils/test/test_writers/test_odt.py
index 4dcb784ec..74788eeb7 100755
--- a/docutils/test/test_writers/test_odt.py
+++ b/docutils/test/test_writers/test_odt.py
@@ -46,6 +46,7 @@ TEMP_FILE_PATH = 'functional/output/'
 INPUT_PATH = 'functional/input/'
 EXPECTED_PATH = 'functional/expected/'
 
+
 class DocutilsOdtTestCase(DocutilsTestSupport.StandardTestCase):
 
     def process_test(self, input_filename, expected_filename,