Finalize single-source port for Py2.[67] and Py3.3+.

6 files changed, 41 insertions, 51 deletions

diff --git a/tests/run.py b/tests/run.py
index 394a8f1b..e87837e5 100644
--- a/tests/run.py
+++ b/tests/run.py
@@ -16,40 +16,29 @@ from __future__ import print_function
 
 import sys, os
 
-if sys.version_info >= (3,):
-    # copy test suite over to "build/lib" and convert it
-    print ('Copying and converting sources to build/lib/test...')
-    from distutils.util import copydir_run_2to3
-    testroot = os.path.dirname(__file__)
-    newroot = os.path.join(testroot, '..', 'build/lib/test')
-    copydir_run_2to3(testroot, newroot)
-    # make nose believe that we run from the converted dir
-    os.chdir(newroot)
-else:
-    # only find tests in this directory
-    if os.path.dirname(__file__):
-        os.chdir(os.path.dirname(__file__))
+# only find tests in this directory
+if os.path.dirname(__file__):
+    os.chdir(os.path.dirname(__file__))
 
 
 try:
     import nose
 except ImportError:
-    print ('nose is required to run the Pygments test suite')
+    print('nose is required to run the Pygments test suite')
     sys.exit(1)
 
 try:
     # make sure the current source is first on sys.path
     sys.path.insert(0, '..')
     import pygments
-except SyntaxError:
-    print(('Syntax error: %s' % sys.exc_info()[1]))
-    print ('Please run setup.py build before make test on Python 3')
+except SyntaxError as err:
+    print('Syntax error: %s' % err)
     sys.exit(1)
-except ImportError:
-    print(('Cannot find Pygments to test: %s' % sys.exc_info()[1]))
+except ImportError as err:
+    print('Cannot find Pygments to test: %s' % err)
     sys.exit(1)
 else:
-    print(('Pygments %s test suite running (Python %s)...' %
-           (pygments.__version__, sys.version.split()[0])))
+    print('Pygments %s test suite running (Python %s)...' %
+          (pygments.__version__, sys.version.split()[0]))
 
 nose.main()
diff --git a/tests/test_basic_api.py b/tests/test_basic_api.py
index 5a7bb42f..78227d2f 100644
--- a/tests/test_basic_api.py
+++ b/tests/test_basic_api.py
@@ -16,7 +16,7 @@ from pygments import lexers, formatters, filters, format
 from pygments.token import _TokenType, Text
 from pygments.lexer import RegexLexer
 from pygments.formatters.img import FontNotFound
-from pygments.util import StringIO, bytes
+from pygments.util import text_type, StringIO, xrange
 
 import support
 
@@ -29,7 +29,7 @@ test_content = ''.join(test_content) + '\n'
 
 def test_lexer_import_all():
     # instantiate every lexer, to see if the token type defs are correct
-    for x in lexers.LEXERS.keys():
+    for x in lexers.LEXERS:
         c = getattr(lexers, x)()
 
 
@@ -73,7 +73,7 @@ def test_lexer_classes():
             assert isinstance(token[0], _TokenType)
             if isinstance(token[1], str):
                 print(repr(token[1]))
-            assert isinstance(token[1], unicode)
+            assert isinstance(token[1], text_type)
             txt += token[1]
         assert txt == test_content, "%s lexer roundtrip failed: %r != %r" % \
                (cls.name, test_content, txt)
@@ -128,7 +128,7 @@ def test_get_lexers():
                        ]:
         yield verify, func, args
 
-    for cls, (_, lname, aliases, _, mimetypes) in lexers.LEXERS.iteritems():
+    for cls, (_, lname, aliases, _, mimetypes) in lexers.LEXERS.items():
         assert cls == lexers.find_lexer_class(lname).__name__
 
         for alias in aliases:
@@ -163,7 +163,7 @@ def test_formatter_public_api():
             pass
         inst.format(ts, out)
 
-    for formatter, info in formatters.FORMATTERS.iteritems():
+    for formatter, info in formatters.FORMATTERS.items():
         yield verify, formatter, info
 
 def test_formatter_encodings():
@@ -173,7 +173,7 @@ def test_formatter_encodings():
     fmt = HtmlFormatter()
     tokens = [(Text, u"ä")]
     out = format(tokens, fmt)
-    assert type(out) is unicode
+    assert type(out) is text_type
     assert u"ä" in out
 
     # encoding option
@@ -202,7 +202,7 @@ def test_formatter_unicode_handling():
         if formatter.name != 'Raw tokens':
             out = format(tokens, inst)
             if formatter.unicodeoutput:
-                assert type(out) is unicode
+                assert type(out) is text_type
 
             inst = formatter(encoding='utf-8')
             out = format(tokens, inst)
@@ -214,7 +214,7 @@ def test_formatter_unicode_handling():
             out = format(tokens, inst)
             assert type(out) is bytes, '%s: %r' % (formatter, out)
 
-    for formatter, info in formatters.FORMATTERS.iteritems():
+    for formatter, info in formatters.FORMATTERS.items():
         yield verify, formatter
 
 
@@ -242,7 +242,7 @@ class FiltersTest(unittest.TestCase):
             'whitespace': {'spaces': True, 'tabs': True, 'newlines': True},
             'highlight': {'names': ['isinstance', 'lexers', 'x']},
         }
-        for x in filters.FILTERS.keys():
+        for x in filters.FILTERS:
             lx = lexers.PythonLexer()
             lx.add_filter(x, **filter_args.get(x, {}))
             fp = open(TESTFILE, 'rb')
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index cbb05db7..ef14661c 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -9,11 +9,12 @@
 
 # Test the command line interface
 
-import sys, os
+import io
+import sys
 import unittest
-import StringIO
 
 from pygments import highlight
+from pygments.util import StringIO
 from pygments.cmdline import main as cmdline_main
 
 import support
@@ -24,8 +25,8 @@ TESTFILE, TESTDIR = support.location(__file__)
 def run_cmdline(*args):
     saved_stdout = sys.stdout
     saved_stderr = sys.stderr
-    new_stdout = sys.stdout = StringIO.StringIO()
-    new_stderr = sys.stderr = StringIO.StringIO()
+    new_stdout = sys.stdout = StringIO()
+    new_stderr = sys.stderr = StringIO()
     try:
         ret = cmdline_main(["pygmentize"] + list(args))
     finally:
diff --git a/tests/test_examplefiles.py b/tests/test_examplefiles.py
index ca68e7d4..0547ffd3 100644
--- a/tests/test_examplefiles.py
+++ b/tests/test_examplefiles.py
@@ -12,11 +12,11 @@ from __future__ import print_function
 import os
 import pprint
 import difflib
-import cPickle as pickle
+import pickle
 
 from pygments.lexers import get_lexer_for_filename, get_lexer_by_name
 from pygments.token import Error
-from pygments.util import ClassNotFound, b
+from pygments.util import ClassNotFound
 
 STORE_OUTPUT = False
 
@@ -65,8 +65,8 @@ def check_lexer(lx, absfn, outfn):
         text = fp.read()
     finally:
         fp.close()
-    text = text.replace(b('\r\n'), b('\n'))
-    text = text.strip(b('\n')) + b('\n')
+    text = text.replace(b'\r\n', b'\n')
+    text = text.strip(b'\n') + b'\n'
     try:
         text = text.decode('utf-8')
         if text.startswith(u'\ufeff'):
diff --git a/tests/test_html_formatter.py b/tests/test_html_formatter.py
index a0489602..91225cd3 100644
--- a/tests/test_html_formatter.py
+++ b/tests/test_html_formatter.py
@@ -9,23 +9,23 @@
 
 from __future__ import print_function
 
+import io
 import os
 import re
 import unittest
-import StringIO
 import tempfile
 from os.path import join, dirname, isfile
 
+from pygments.util import StringIO
 from pygments.lexers import PythonLexer
 from pygments.formatters import HtmlFormatter, NullFormatter
 from pygments.formatters.html import escape_html
-from pygments.util import uni_open
 
 import support
 
 TESTFILE, TESTDIR = support.location(__file__)
 
-fp = uni_open(TESTFILE, encoding='utf-8')
+fp = io.open(TESTFILE, encoding='utf-8')
 try:
     tokensource = list(PythonLexer().get_tokens(fp.read()))
 finally:
@@ -35,11 +35,11 @@ finally:
 class HtmlFormatterTest(unittest.TestCase):
     def test_correct_output(self):
         hfmt = HtmlFormatter(nowrap=True)
-        houtfile = StringIO.StringIO()
+        houtfile = StringIO()
         hfmt.format(tokensource, houtfile)
 
         nfmt = NullFormatter()
-        noutfile = StringIO.StringIO()
+        noutfile = StringIO()
         nfmt.format(tokensource, noutfile)
 
         stripped_html = re.sub('<.*?>', '', houtfile.getvalue())
@@ -76,13 +76,13 @@ class HtmlFormatterTest(unittest.TestCase):
                         dict(linenos=True, full=True),
                         dict(linenos=True, full=True, noclasses=True)]:
 
-            outfile = StringIO.StringIO()
+            outfile = StringIO()
             fmt = HtmlFormatter(**optdict)
             fmt.format(tokensource, outfile)
 
     def test_linenos(self):
         optdict = dict(linenos=True)
-        outfile = StringIO.StringIO()
+        outfile = StringIO()
         fmt = HtmlFormatter(**optdict)
         fmt.format(tokensource, outfile)
         html = outfile.getvalue()
@@ -90,7 +90,7 @@ class HtmlFormatterTest(unittest.TestCase):
 
     def test_linenos_with_startnum(self):
         optdict = dict(linenos=True, linenostart=5)
-        outfile = StringIO.StringIO()
+        outfile = StringIO()
         fmt = HtmlFormatter(**optdict)
         fmt.format(tokensource, outfile)
         html = outfile.getvalue()
@@ -98,7 +98,7 @@ class HtmlFormatterTest(unittest.TestCase):
 
     def test_lineanchors(self):
         optdict = dict(lineanchors="foo")
-        outfile = StringIO.StringIO()
+        outfile = StringIO()
         fmt = HtmlFormatter(**optdict)
         fmt.format(tokensource, outfile)
         html = outfile.getvalue()
@@ -106,7 +106,7 @@ class HtmlFormatterTest(unittest.TestCase):
 
     def test_lineanchors_with_startnum(self):
         optdict = dict(lineanchors="foo", linenostart=5)
-        outfile = StringIO.StringIO()
+        outfile = StringIO()
         fmt = HtmlFormatter(**optdict)
         fmt.format(tokensource, outfile)
         html = outfile.getvalue()
@@ -174,7 +174,7 @@ class HtmlFormatterTest(unittest.TestCase):
             # anymore in the actual source
             fmt = HtmlFormatter(tagsfile='support/tags', lineanchors='L',
                                 tagurlformat='%(fname)s%(fext)s')
-            outfile = StringIO.StringIO()
+            outfile = StringIO()
             fmt.format(tokensource, outfile)
             self.assertTrue('<a href="test_html_formatter.py#L-165">test_ctags</a>'
                             in outfile.getvalue())
diff --git a/tests/test_token.py b/tests/test_token.py
index 26cc772e..c5cc4990 100644
--- a/tests/test_token.py
+++ b/tests/test_token.py
@@ -36,11 +36,11 @@ class TokenTest(unittest.TestCase):
         stp = token.STANDARD_TYPES.copy()
         stp[token.Token] = '---' # Token and Text do conflict, that is okay
         t = {}
-        for k, v in stp.iteritems():
+        for k, v in stp.items():
             t.setdefault(v, []).append(k)
         if len(t) == len(stp):
             return # Okay
 
-        for k, v in t.iteritems():
+        for k, v in t.items():
             if len(v) > 1:
                 self.fail("%r has more than one key: %r" % (k, v))