remove lib2to3 usage

4 files changed, 165 insertions, 366 deletions

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index a7a2112f..564adf2b 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -3,11 +3,8 @@ import locale
 import pytest
 
 
-__all__ = ['fail_on_ascii', 'ack_2to3']
+__all__ = ['fail_on_ascii']
 
 
 is_ascii = locale.getpreferredencoding() == 'ANSI_X3.4-1968'
 fail_on_ascii = pytest.mark.xfail(is_ascii, reason="Test fails in this locale")
-
-
-ack_2to3 = pytest.mark.filterwarnings('ignore:2to3 support is deprecated')
diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index ec65250e..005742e4 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -30,14 +30,11 @@ def make_package_dir(name, base_dir, ns=False):
 
 
 def fake_env(
-        tmpdir, setup_cfg, setup_py=None,
-        encoding='ascii', package_path='fake_package'):
+    tmpdir, setup_cfg, setup_py=None, encoding='ascii', package_path='fake_package'
+):
 
     if setup_py is None:
-        setup_py = (
-            'from setuptools import setup\n'
-            'setup()\n'
-        )
+        setup_py = 'from setuptools import setup\n' 'setup()\n'
 
     tmpdir.join('setup.py').write(setup_py)
     config = tmpdir.join('setup.cfg')
@@ -78,7 +75,6 @@ def test_parsers_implemented():
 
 
 class TestConfigurationReader:
-
     def test_basic(self, tmpdir):
         _, config = fake_env(
             tmpdir,
@@ -87,7 +83,7 @@ class TestConfigurationReader:
             'keywords = one, two\n'
             '\n'
             '[options]\n'
-            'scripts = bin/a.py, bin/b.py\n'
+            'scripts = bin/a.py, bin/b.py\n',
         )
         config_dict = read_configuration('%s' % config)
         assert config_dict['metadata']['version'] == '10.1.1'
@@ -101,15 +97,12 @@ class TestConfigurationReader:
     def test_ignore_errors(self, tmpdir):
         _, config = fake_env(
             tmpdir,
-            '[metadata]\n'
-            'version = attr: none.VERSION\n'
-            'keywords = one, two\n'
+            '[metadata]\n' 'version = attr: none.VERSION\n' 'keywords = one, two\n',
         )
         with pytest.raises(ImportError):
             read_configuration('%s' % config)
 
-        config_dict = read_configuration(
-            '%s' % config, ignore_option_errors=True)
+        config_dict = read_configuration('%s' % config, ignore_option_errors=True)
 
         assert config_dict['metadata']['keywords'] == ['one', 'two']
         assert 'version' not in config_dict['metadata']
@@ -118,7 +111,6 @@ class TestConfigurationReader:
 
 
 class TestMetadata:
-
     def test_basic(self, tmpdir):
 
         fake_env(
@@ -133,7 +125,7 @@ class TestMetadata:
             'provides = package, package.sub\n'
             'license = otherlic\n'
             'download_url = http://test.test.com/test/\n'
-            'maintainer_email = test@test.com\n'
+            'maintainer_email = test@test.com\n',
         )
 
         tmpdir.join('README').write('readme contents\nline2')
@@ -160,12 +152,14 @@ class TestMetadata:
     def test_license_cfg(self, tmpdir):
         fake_env(
             tmpdir,
-            DALS("""
+            DALS(
+                """
             [metadata]
             name=foo
             version=0.0.1
             license=Apache 2.0
-            """)
+            """
+            ),
         )
 
         with get_dist(tmpdir) as dist:
@@ -179,9 +173,7 @@ class TestMetadata:
 
         fake_env(
             tmpdir,
-            '[metadata]\n'
-            'long_description = file: README.rst, CHANGES.rst\n'
-            '\n'
+            '[metadata]\n' 'long_description = file: README.rst, CHANGES.rst\n' '\n',
         )
 
         tmpdir.join('README.rst').write('readme contents\nline2')
@@ -189,17 +181,12 @@ class TestMetadata:
 
         with get_dist(tmpdir) as dist:
             assert dist.metadata.long_description == (
-                'readme contents\nline2\n'
-                'changelog contents\nand stuff'
+                'readme contents\nline2\n' 'changelog contents\nand stuff'
             )
 
     def test_file_sandboxed(self, tmpdir):
 
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'long_description = file: ../../README\n'
-        )
+        fake_env(tmpdir, '[metadata]\n' 'long_description = file: ../../README\n')
 
         with get_dist(tmpdir, parse=False) as dist:
             with pytest.raises(DistutilsOptionError):
@@ -216,7 +203,7 @@ class TestMetadata:
             'platform = a, b\n'
             'classifier =\n'
             '  Framework :: Django\n'
-            '  Programming Language :: Python :: 3.5\n'
+            '  Programming Language :: Python :: 3.5\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -241,7 +228,7 @@ class TestMetadata:
             '  two\n'
             'classifiers =\n'
             '  Framework :: Django\n'
-            '  Programming Language :: Python :: 3.5\n'
+            '  Programming Language :: Python :: 3.5\n',
         )
         with get_dist(tmpdir) as dist:
             metadata = dist.metadata
@@ -258,7 +245,7 @@ class TestMetadata:
             '[metadata]\n'
             'project_urls =\n'
             '  Link One = https://example.com/one/\n'
-            '  Link Two = https://example.com/two/\n'
+            '  Link Two = https://example.com/two/\n',
         )
         with get_dist(tmpdir) as dist:
             metadata = dist.metadata
@@ -270,9 +257,7 @@ class TestMetadata:
     def test_version(self, tmpdir):
 
         package_dir, config = fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = attr: fake_package.VERSION\n'
+            tmpdir, '[metadata]\n' 'version = attr: fake_package.VERSION\n'
         )
 
         sub_a = package_dir.mkdir('subpkg_a')
@@ -282,37 +267,28 @@ class TestMetadata:
         sub_b = package_dir.mkdir('subpkg_b')
         sub_b.join('__init__.py').write('')
         sub_b.join('mod.py').write(
-            'import third_party_module\n'
-            'VERSION = (2016, 11, 26)'
+            'import third_party_module\n' 'VERSION = (2016, 11, 26)'
         )
 
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1.2.3'
 
-        config.write(
-            '[metadata]\n'
-            'version = attr: fake_package.get_version\n'
-        )
+        config.write('[metadata]\n' 'version = attr: fake_package.get_version\n')
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '3.4.5.dev'
 
-        config.write(
-            '[metadata]\n'
-            'version = attr: fake_package.VERSION_MAJOR\n'
-        )
+        config.write('[metadata]\n' 'version = attr: fake_package.VERSION_MAJOR\n')
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '1'
 
         config.write(
-            '[metadata]\n'
-            'version = attr: fake_package.subpkg_a.mod.VERSION\n'
+            '[metadata]\n' 'version = attr: fake_package.subpkg_a.mod.VERSION\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
 
         config.write(
-            '[metadata]\n'
-            'version = attr: fake_package.subpkg_b.mod.VERSION\n'
+            '[metadata]\n' 'version = attr: fake_package.subpkg_b.mod.VERSION\n'
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.version == '2016.11.26'
@@ -320,9 +296,7 @@ class TestMetadata:
     def test_version_file(self, tmpdir):
 
         _, config = fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'version = file: fake_package/version.txt\n'
+            tmpdir, '[metadata]\n' 'version = file: fake_package/version.txt\n'
         )
         tmpdir.join('fake_package', 'version.txt').write('1.2.3\n')
 
@@ -343,7 +317,7 @@ class TestMetadata:
             '[options]\n'
             'package_dir =\n'
             '    = src\n',
-            package_path='src/fake_package_simple'
+            package_path='src/fake_package_simple',
         )
 
         with get_dist(tmpdir) as dist:
@@ -358,7 +332,7 @@ class TestMetadata:
             '[options]\n'
             'package_dir =\n'
             '    fake_package_rename = fake_dir\n',
-            package_path='fake_dir'
+            package_path='fake_dir',
         )
 
         with get_dist(tmpdir) as dist:
@@ -373,7 +347,7 @@ class TestMetadata:
             '[options]\n'
             'package_dir =\n'
             '    fake_package_complex = src/fake_dir\n',
-            package_path='src/fake_dir'
+            package_path='src/fake_dir',
         )
 
         with get_dist(tmpdir) as dist:
@@ -381,39 +355,28 @@ class TestMetadata:
 
     def test_unknown_meta_item(self, tmpdir):
 
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'name = fake_name\n'
-            'unknown = some\n'
-        )
+        fake_env(tmpdir, '[metadata]\n' 'name = fake_name\n' 'unknown = some\n')
         with get_dist(tmpdir, parse=False) as dist:
             dist.parse_config_files()  # Skip unknown.
 
     def test_usupported_section(self, tmpdir):
 
-        fake_env(
-            tmpdir,
-            '[metadata.some]\n'
-            'key = val\n'
-        )
+        fake_env(tmpdir, '[metadata.some]\n' 'key = val\n')
         with get_dist(tmpdir, parse=False) as dist:
             with pytest.raises(DistutilsOptionError):
                 dist.parse_config_files()
 
     def test_classifiers(self, tmpdir):
-        expected = set([
-            'Framework :: Django',
-            'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.5',
-        ])
+        expected = set(
+            [
+                'Framework :: Django',
+                'Programming Language :: Python :: 3',
+                'Programming Language :: Python :: 3.5',
+            ]
+        )
 
         # From file.
-        _, config = fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'classifiers = file: classifiers\n'
-        )
+        _, config = fake_env(tmpdir, '[metadata]\n' 'classifiers = file: classifiers\n')
 
         tmpdir.join('classifiers').write(
             'Framework :: Django\n'
@@ -441,7 +404,7 @@ class TestMetadata:
             '[metadata]\n'
             'version = 10.1.1\n'
             'description = Some description\n'
-            'requires = some, requirement\n'
+            'requires = some, requirement\n',
         )
 
         with pytest.deprecated_call():
@@ -453,41 +416,26 @@ class TestMetadata:
                 assert metadata.requires == ['some', 'requirement']
 
     def test_interpolation(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'description = %(message)s\n'
-        )
+        fake_env(tmpdir, '[metadata]\n' 'description = %(message)s\n')
         with pytest.raises(configparser.InterpolationMissingOptionError):
             with get_dist(tmpdir):
                 pass
 
     def test_non_ascii_1(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'description = éàïôñ\n',
-            encoding='utf-8'
-        )
+        fake_env(tmpdir, '[metadata]\n' 'description = éàïôñ\n', encoding='utf-8')
         with get_dist(tmpdir):
             pass
 
     def test_non_ascii_3(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '\n'
-            '# -*- coding: invalid\n'
-        )
+        fake_env(tmpdir, '\n' '# -*- coding: invalid\n')
         with get_dist(tmpdir):
             pass
 
     def test_non_ascii_4(self, tmpdir):
         fake_env(
             tmpdir,
-            '# -*- coding: utf-8\n'
-            '[metadata]\n'
-            'description = éàïôñ\n',
-            encoding='utf-8'
+            '# -*- coding: utf-8\n' '[metadata]\n' 'description = éàïôñ\n',
+            encoding='utf-8',
         )
         with get_dist(tmpdir) as dist:
             assert dist.metadata.description == 'éàïôñ'
@@ -501,7 +449,7 @@ class TestMetadata:
             '# vim: set fileencoding=iso-8859-15 :\n'
             '[metadata]\n'
             'description = éàïôñ\n',
-            encoding='iso-8859-15'
+            encoding='iso-8859-15',
         )
         with pytest.raises(UnicodeDecodeError):
             with get_dist(tmpdir):
@@ -514,11 +462,13 @@ class TestMetadata:
             tmpdir,
             '[metadata]\n'
             'author-email = test@test.com\n'
-            'maintainer_email = foo@foo.com\n'
-            )
-        msg = ("Usage of dash-separated 'author-email' will not be supported "
-               "in future versions. "
-               "Please use the underscore name 'author_email' instead")
+            'maintainer_email = foo@foo.com\n',
+        )
+        msg = (
+            "Usage of dash-separated 'author-email' will not be supported "
+            "in future versions. "
+            "Please use the underscore name 'author_email' instead"
+        )
         with pytest.warns(UserWarning, match=msg):
             with get_dist(tmpdir) as dist:
                 metadata = dist.metadata
@@ -530,14 +480,13 @@ class TestMetadata:
         # remove this test and the method make_option_lowercase() in setuptools.dist
         # when no longer needed
         fake_env(
-            tmpdir,
-            '[metadata]\n'
-            'Name = foo\n'
-            'description = Some description\n'
+            tmpdir, '[metadata]\n' 'Name = foo\n' 'description = Some description\n'
+        )
+        msg = (
+            "Usage of uppercase key 'Name' in 'metadata' will be deprecated in "
+            "future versions. "
+            "Please use lowercase 'name' instead"
         )
-        msg = ("Usage of uppercase key 'Name' in 'metadata' will be deprecated in "
-               "future versions. "
-               "Please use lowercase 'name' instead")
         with pytest.warns(UserWarning, match=msg):
             with get_dist(tmpdir) as dist:
                 metadata = dist.metadata
@@ -547,21 +496,16 @@ class TestMetadata:
 
 
 class TestOptions:
-
     def test_basic(self, tmpdir):
 
         fake_env(
             tmpdir,
             '[options]\n'
             'zip_safe = True\n'
-            'use_2to3 = 1\n'
             'include_package_data = yes\n'
             'package_dir = b=c, =src\n'
             'packages = pack_a, pack_b.subpack\n'
             'namespace_packages = pack1, pack2\n'
-            'use_2to3_fixers = your.fixers, or.here\n'
-            'use_2to3_exclude_fixers = one.here, two.there\n'
-            'convert_2to3_doctests = src/tests/one.txt, src/two.txt\n'
             'scripts = bin/one.py, bin/two.py\n'
             'eager_resources = bin/one.py, bin/two.py\n'
             'install_requires = docutils>=0.3; pack ==1.1, ==1.3; hey\n'
@@ -570,34 +514,24 @@ class TestOptions:
             'dependency_links = http://some.com/here/1, '
             'http://some.com/there/2\n'
             'python_requires = >=1.0, !=2.8\n'
-            'py_modules = module1, module2\n'
+            'py_modules = module1, module2\n',
         )
         with get_dist(tmpdir) as dist:
             assert dist.zip_safe
-            assert dist.use_2to3
             assert dist.include_package_data
             assert dist.package_dir == {'': 'src', 'b': 'c'}
             assert dist.packages == ['pack_a', 'pack_b.subpack']
             assert dist.namespace_packages == ['pack1', 'pack2']
-            assert dist.use_2to3_fixers == ['your.fixers', 'or.here']
-            assert dist.use_2to3_exclude_fixers == ['one.here', 'two.there']
-            assert dist.convert_2to3_doctests == ([
-                'src/tests/one.txt', 'src/two.txt'])
             assert dist.scripts == ['bin/one.py', 'bin/two.py']
-            assert dist.dependency_links == ([
-                'http://some.com/here/1',
-                'http://some.com/there/2'
-            ])
-            assert dist.install_requires == ([
-                'docutils>=0.3',
-                'pack==1.1,==1.3',
-                'hey'
-            ])
-            assert dist.setup_requires == ([
-                'docutils>=0.3',
-                'spack ==1.1, ==1.3',
-                'there'
-            ])
+            assert dist.dependency_links == (
+                ['http://some.com/here/1', 'http://some.com/there/2']
+            )
+            assert dist.install_requires == (
+                ['docutils>=0.3', 'pack==1.1,==1.3', 'hey']
+            )
+            assert dist.setup_requires == (
+                ['docutils>=0.3', 'spack ==1.1, ==1.3', 'there']
+            )
             assert dist.tests_require == ['mock==0.7.2', 'pytest']
             assert dist.python_requires == '>=1.0, !=2.8'
             assert dist.py_modules == ['module1', 'module2']
@@ -615,15 +549,6 @@ class TestOptions:
             'namespace_packages = \n'
             '  pack1\n'
             '  pack2\n'
-            'use_2to3_fixers = \n'
-            '  your.fixers\n'
-            '  or.here\n'
-            'use_2to3_exclude_fixers = \n'
-            '  one.here\n'
-            '  two.there\n'
-            'convert_2to3_doctests = \n'
-            '  src/tests/one.txt\n'
-            '  src/two.txt\n'
             'scripts = \n'
             '  bin/one.py\n'
             '  bin/two.py\n'
@@ -643,39 +568,26 @@ class TestOptions:
             '  there\n'
             'dependency_links = \n'
             '  http://some.com/here/1\n'
-            '  http://some.com/there/2\n'
+            '  http://some.com/there/2\n',
         )
         with get_dist(tmpdir) as dist:
             assert dist.package_dir == {'': 'src', 'b': 'c'}
             assert dist.packages == ['pack_a', 'pack_b.subpack']
             assert dist.namespace_packages == ['pack1', 'pack2']
-            assert dist.use_2to3_fixers == ['your.fixers', 'or.here']
-            assert dist.use_2to3_exclude_fixers == ['one.here', 'two.there']
-            assert dist.convert_2to3_doctests == (
-                ['src/tests/one.txt', 'src/two.txt'])
             assert dist.scripts == ['bin/one.py', 'bin/two.py']
-            assert dist.dependency_links == ([
-                'http://some.com/here/1',
-                'http://some.com/there/2'
-            ])
-            assert dist.install_requires == ([
-                'docutils>=0.3',
-                'pack==1.1,==1.3',
-                'hey'
-            ])
-            assert dist.setup_requires == ([
-                'docutils>=0.3',
-                'spack ==1.1, ==1.3',
-                'there'
-            ])
+            assert dist.dependency_links == (
+                ['http://some.com/here/1', 'http://some.com/there/2']
+            )
+            assert dist.install_requires == (
+                ['docutils>=0.3', 'pack==1.1,==1.3', 'hey']
+            )
+            assert dist.setup_requires == (
+                ['docutils>=0.3', 'spack ==1.1, ==1.3', 'there']
+            )
             assert dist.tests_require == ['mock==0.7.2', 'pytest']
 
     def test_package_dir_fail(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options]\n'
-            'package_dir = a b\n'
-        )
+        fake_env(tmpdir, '[options]\n' 'package_dir = a b\n')
         with get_dist(tmpdir, parse=False) as dist:
             with pytest.raises(DistutilsOptionError):
                 dist.parse_config_files()
@@ -689,7 +601,7 @@ class TestOptions:
             '\n'
             '[options.exclude_package_data]\n'
             '* = fake1.txt, fake2.txt\n'
-            'hello = *.dat\n'
+            'hello = *.dat\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -703,29 +615,21 @@ class TestOptions:
             }
 
     def test_packages(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options]\n'
-            'packages = find:\n'
-        )
+        fake_env(tmpdir, '[options]\n' 'packages = find:\n')
 
         with get_dist(tmpdir) as dist:
             assert dist.packages == ['fake_package']
 
     def test_find_directive(self, tmpdir):
-        dir_package, config = fake_env(
-            tmpdir,
-            '[options]\n'
-            'packages = find:\n'
-        )
+        dir_package, config = fake_env(tmpdir, '[options]\n' 'packages = find:\n')
 
         dir_sub_one, _ = make_package_dir('sub_one', dir_package)
         dir_sub_two, _ = make_package_dir('sub_two', dir_package)
 
         with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == set([
-                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one'
-            ])
+            assert set(dist.packages) == set(
+                ['fake_package', 'fake_package.sub_two', 'fake_package.sub_one']
+            )
 
         config.write(
             '[options]\n'
@@ -749,14 +653,11 @@ class TestOptions:
             '    fake_package.sub_one\n'
         )
         with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == set(
-                ['fake_package', 'fake_package.sub_two'])
+            assert set(dist.packages) == set(['fake_package', 'fake_package.sub_two'])
 
     def test_find_namespace_directive(self, tmpdir):
         dir_package, config = fake_env(
-            tmpdir,
-            '[options]\n'
-            'packages = find_namespace:\n'
+            tmpdir, '[options]\n' 'packages = find_namespace:\n'
         )
 
         dir_sub_one, _ = make_package_dir('sub_one', dir_package)
@@ -764,7 +665,9 @@ class TestOptions:
 
         with get_dist(tmpdir) as dist:
             assert set(dist.packages) == {
-                'fake_package', 'fake_package.sub_two', 'fake_package.sub_one'
+                'fake_package',
+                'fake_package.sub_two',
+                'fake_package.sub_one',
             }
 
         config.write(
@@ -789,9 +692,7 @@ class TestOptions:
             '    fake_package.sub_one\n'
         )
         with get_dist(tmpdir) as dist:
-            assert set(dist.packages) == {
-                'fake_package', 'fake_package.sub_two'
-            }
+            assert set(dist.packages) == {'fake_package', 'fake_package.sub_two'}
 
     def test_extras_require(self, tmpdir):
         fake_env(
@@ -800,29 +701,21 @@ class TestOptions:
             'pdf = ReportLab>=1.2; RXP\n'
             'rest = \n'
             '  docutils>=0.3\n'
-            '  pack ==1.1, ==1.3\n'
+            '  pack ==1.1, ==1.3\n',
         )
 
         with get_dist(tmpdir) as dist:
             assert dist.extras_require == {
                 'pdf': ['ReportLab>=1.2', 'RXP'],
-                'rest': ['docutils>=0.3', 'pack==1.1,==1.3']
+                'rest': ['docutils>=0.3', 'pack==1.1,==1.3'],
             }
             assert dist.metadata.provides_extras == set(['pdf', 'rest'])
 
     def test_dash_preserved_extras_require(self, tmpdir):
-        fake_env(
-            tmpdir,
-            '[options.extras_require]\n'
-            'foo-a = foo\n'
-            'foo_b = test\n'
-        )
+        fake_env(tmpdir, '[options.extras_require]\n' 'foo-a = foo\n' 'foo_b = test\n')
 
         with get_dist(tmpdir) as dist:
-            assert dist.extras_require == {
-                'foo-a': ['foo'],
-                'foo_b': ['test']
-            }
+            assert dist.extras_require == {'foo-a': ['foo'], 'foo_b': ['test']}
 
     def test_entry_points(self, tmpdir):
         _, config = fake_env(
@@ -830,7 +723,7 @@ class TestOptions:
             '[options.entry_points]\n'
             'group1 = point1 = pack.module:func, '
             '.point2 = pack.module2:func_rest [rest]\n'
-            'group2 = point3 = pack.module:func2\n'
+            'group2 = point3 = pack.module:func2\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -839,7 +732,7 @@ class TestOptions:
                     'point1 = pack.module:func',
                     '.point2 = pack.module2:func_rest [rest]',
                 ],
-                'group2': ['point3 = pack.module:func2']
+                'group2': ['point3 = pack.module:func2'],
             }
 
         expected = (
@@ -850,10 +743,7 @@ class TestOptions:
         tmpdir.join('entry_points').write(expected)
 
         # From file.
-        config.write(
-            '[options]\n'
-            'entry_points = file: entry_points\n'
-        )
+        config.write('[options]\n' 'entry_points = file: entry_points\n')
 
         with get_dist(tmpdir) as dist:
             assert dist.entry_points == expected
@@ -864,7 +754,7 @@ class TestOptions:
             '[options.entry_points]\n'
             'GROUP1 = point1 = pack.module:func, '
             '.point2 = pack.module2:func_rest [rest]\n'
-            'group2 = point3 = pack.module:func2\n'
+            'group2 = point3 = pack.module:func2\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -873,7 +763,7 @@ class TestOptions:
                     'point1 = pack.module:func',
                     '.point2 = pack.module2:func_rest [rest]',
                 ],
-                'group2': ['point3 = pack.module:func2']
+                'group2': ['point3 = pack.module:func2'],
             }
 
     def test_data_files(self, tmpdir):
@@ -883,7 +773,7 @@ class TestOptions:
             'cfg =\n'
             '      a/b.conf\n'
             '      c/d.conf\n'
-            'data = e/f.dat, g/h.dat\n'
+            'data = e/f.dat, g/h.dat\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -931,10 +821,12 @@ class TestOptions:
     def test_python_requires_simple(self, tmpdir):
         fake_env(
             tmpdir,
-            DALS("""
+            DALS(
+                """
             [options]
             python_requires=>=2.7
-            """),
+            """
+            ),
         )
         with get_dist(tmpdir) as dist:
             dist.parse_config_files()
@@ -942,10 +834,12 @@ class TestOptions:
     def test_python_requires_compound(self, tmpdir):
         fake_env(
             tmpdir,
-            DALS("""
+            DALS(
+                """
             [options]
             python_requires=>=2.7,!=3.0.*
-            """),
+            """
+            ),
         )
         with get_dist(tmpdir) as dist:
             dist.parse_config_files()
@@ -953,10 +847,12 @@ class TestOptions:
     def test_python_requires_invalid(self, tmpdir):
         fake_env(
             tmpdir,
-            DALS("""
+            DALS(
+                """
             [options]
             python_requires=invalid
-            """),
+            """
+            ),
         )
         with pytest.raises(Exception):
             with get_dist(tmpdir) as dist:
@@ -974,9 +870,7 @@ class TestOptions:
 
         fake_env(
             tmpdir,
-            '[options]\n'
-            'cmdclass =\n'
-            '    customcmd = custom_build.CustomCmd\n'
+            '[options]\n' 'cmdclass =\n' '    customcmd = custom_build.CustomCmd\n',
         )
 
         with get_dist(tmpdir) as dist:
@@ -1000,24 +894,23 @@ class TestExternalSetters:
     def _fake_distribution_init(self, dist, attrs):
         saved_dist_init(dist, attrs)
         # see self._DISTUTUILS_UNSUPPORTED_METADATA
-        setattr(dist.metadata, 'long_description_content_type',
-                'text/something')
+        setattr(dist.metadata, 'long_description_content_type', 'text/something')
         # Test overwrite setup() args
-        setattr(dist.metadata, 'project_urls', {
-            'Link One': 'https://example.com/one/',
-            'Link Two': 'https://example.com/two/',
-        })
+        setattr(
+            dist.metadata,
+            'project_urls',
+            {
+                'Link One': 'https://example.com/one/',
+                'Link Two': 'https://example.com/two/',
+            },
+        )
         return None
 
     @patch.object(_Distribution, '__init__', autospec=True)
     def test_external_setters(self, mock_parent_init, tmpdir):
         mock_parent_init.side_effect = self._fake_distribution_init
 
-        dist = Distribution(attrs={
-            'project_urls': {
-                'will_be': 'ignored'
-            }
-        })
+        dist = Distribution(attrs={'project_urls': {'will_be': 'ignored'}})
 
         assert dist.metadata.long_description_content_type == 'text/something'
         assert dist.metadata.project_urls == {
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index df8db4e2..3c2d924c 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -16,7 +16,6 @@ import pytest
 
 from setuptools.command.develop import develop
 from setuptools.dist import Distribution
-from setuptools.tests import ack_2to3
 from . import contexts
 from . import namespaces
 
@@ -25,7 +24,6 @@ from setuptools import setup
 
 setup(name='foo',
     packages=['foo'],
-    use_2to3=True,
 )
 """
 
@@ -62,43 +60,6 @@ class TestDevelop:
     in_virtualenv = hasattr(sys, 'real_prefix')
     in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix
 
-    @pytest.mark.skipif(
-        in_virtualenv or in_venv,
-        reason="Cannot run when invoked in a virtualenv or venv")
-    @ack_2to3
-    def test_2to3_user_mode(self, test_env):
-        settings = dict(
-            name='foo',
-            packages=['foo'],
-            use_2to3=True,
-            version='0.0',
-        )
-        dist = Distribution(settings)
-        dist.script_name = 'setup.py'
-        cmd = develop(dist)
-        cmd.user = 1
-        cmd.ensure_finalized()
-        cmd.install_dir = site.USER_SITE
-        cmd.user = 1
-        with contexts.quiet():
-            cmd.run()
-
-        # let's see if we got our egg link at the right place
-        content = os.listdir(site.USER_SITE)
-        content.sort()
-        assert content == ['easy-install.pth', 'foo.egg-link']
-
-        # Check that we are using the right code.
-        fn = os.path.join(site.USER_SITE, 'foo.egg-link')
-        with io.open(fn) as egg_link_file:
-            path = egg_link_file.read().split()[0].strip()
-        fn = os.path.join(path, 'foo', '__init__.py')
-        with io.open(fn) as init_file:
-            init = init_file.read().strip()
-
-        expected = 'print("foo")'
-        assert init == expected
-
     def test_console_scripts(self, tmpdir):
         """
         Test that console scripts are installed and that they reference
@@ -106,7 +67,8 @@ class TestDevelop:
         """
         pytest.skip(
             "TODO: needs a fixture to cause 'develop' "
-            "to be invoked without mutating environment.")
+            "to be invoked without mutating environment."
+        )
         settings = dict(
             name='foo',
             packages=['foo'],
@@ -132,6 +94,7 @@ class TestResolver:
     of what _resolve_setup_path is intending to do. Come up with
     more meaningful cases that look like real-world scenarios.
     """
+
     def test_resolve_setup_path_cwd(self):
         assert develop._resolve_setup_path('.', '.', '.') == '.'
 
@@ -143,7 +106,6 @@ class TestResolver:
 
 
 class TestNamespaces:
-
     @staticmethod
     def install_develop(src_dir, target):
 
@@ -151,7 +113,8 @@ class TestNamespaces:
             sys.executable,
             'setup.py',
             'develop',
-            '--install-dir', str(target),
+            '--install-dir',
+            str(target),
         ]
         with src_dir.as_cwd():
             with test.test.paths_on_pythonpath([str(target)]):
@@ -182,14 +145,16 @@ class TestNamespaces:
             'pip',
             'install',
             str(pkg_A),
-            '-t', str(target),
+            '-t',
+            str(target),
         ]
         subprocess.check_call(install_cmd)
         self.install_develop(pkg_B, target)
         namespaces.make_site_dir(target)
         try_import = [
             sys.executable,
-            '-c', 'import myns.pkgA; import myns.pkgB',
+            '-c',
+            'import myns.pkgA; import myns.pkgB',
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(try_import)
@@ -197,7 +162,8 @@ class TestNamespaces:
         # additionally ensure that pkg_resources import works
         pkg_resources_imp = [
             sys.executable,
-            '-c', 'import pkg_resources',
+            '-c',
+            'import pkg_resources',
         ]
         with test.test.paths_on_pythonpath([str(target)]):
             subprocess.check_call(pkg_resources_imp)
@@ -206,12 +172,16 @@ class TestNamespaces:
     def install_workaround(site_packages):
         site_packages.mkdir(parents=True)
         sc = site_packages / 'sitecustomize.py'
-        sc.write_text(textwrap.dedent("""
+        sc.write_text(
+            textwrap.dedent(
+                """
             import site
             import pathlib
             here = pathlib.Path(__file__).parent
             site.addsitedir(str(here))
-            """).lstrip())
+            """
+            ).lstrip()
+        )
 
     @pytest.mark.xfail(
         platform.python_implementation() == 'PyPy',
@@ -228,8 +198,7 @@ class TestNamespaces:
         site_packages = prefix / next(
             pathlib.Path(path).relative_to(sys.prefix)
             for path in sys.path
-            if 'site-packages' in path
-            and path.startswith(sys.prefix)
+            if 'site-packages' in path and path.startswith(sys.prefix)
         )
 
         # install the workaround
@@ -238,11 +207,13 @@ class TestNamespaces:
         env = dict(os.environ, PYTHONPATH=str(site_packages))
         cmd = [
             sys.executable,
-            '-m', 'pip',
+            '-m',
+            'pip',
             'install',
             '--editable',
             str(sample_project),
-            '--prefix', str(prefix),
+            '--prefix',
+            str(prefix),
             '--no-build-isolation',
         ]
         subprocess.check_call(cmd, env=env)
diff --git a/setuptools/tests/test_test.py b/setuptools/tests/test_test.py
index 180562e2..4e7193c8 100644
--- a/setuptools/tests/test_test.py
+++ b/setuptools/tests/test_test.py
@@ -6,12 +6,12 @@ import pytest
 
 from setuptools.command.test import test
 from setuptools.dist import Distribution
-from setuptools.tests import ack_2to3
 
 from .textwrap import DALS
 
 
-SETUP_PY = DALS("""
+SETUP_PY = DALS(
+    """
     from setuptools import setup
 
     setup(name='foo',
@@ -19,9 +19,11 @@ SETUP_PY = DALS("""
         namespace_packages=['name'],
         test_suite='name.space.tests.test_suite',
     )
-    """)
+    """
+)
 
-NS_INIT = DALS("""
+NS_INIT = DALS(
+    """
     # -*- coding: Latin-1 -*-
     # Söme Arbiträry Ünicode to test Distribute Issüé 310
     try:
@@ -29,17 +31,20 @@ NS_INIT = DALS("""
     except ImportError:
         from pkgutil import extend_path
         __path__ = extend_path(__path__, __name__)
-    """)
+    """
+)
 
-TEST_PY = DALS("""
+TEST_PY = DALS(
+    """
     import unittest
 
     class TestTest(unittest.TestCase):
         def test_test(self):
-            print "Foo" # Should fail under Python 3 unless 2to3 is used
+            print "Foo" # Should fail under Python 3
 
     test_suite = unittest.makeSuite(TestTest)
-    """)
+    """
+)
 
 
 @pytest.fixture
@@ -70,25 +75,6 @@ def quiet_log():
     log.set_verbosity(0)
 
 
-@pytest.mark.usefixtures('sample_test', 'quiet_log')
-@ack_2to3
-def test_test(capfd):
-    params = dict(
-        name='foo',
-        packages=['name', 'name.space', 'name.space.tests'],
-        namespace_packages=['name'],
-        test_suite='name.space.tests.test_suite',
-        use_2to3=True,
-    )
-    dist = Distribution(params)
-    dist.script_name = 'setup.py'
-    cmd = test(dist)
-    cmd.ensure_finalized()
-    cmd.run()
-    out, err = capfd.readouterr()
-    assert out == 'Foo\n'
-
-
 @pytest.mark.usefixtures('tmpdir_cwd', 'quiet_log')
 def test_tests_are_run_once(capfd):
     params = dict(
@@ -104,13 +90,16 @@ def test_tests_are_run_once(capfd):
     with open('dummy/__init__.py', 'wt'):
         pass
     with open('dummy/test_dummy.py', 'wt') as f:
-        f.write(DALS(
-            """
+        f.write(
+            DALS(
+                """
             import unittest
             class TestTest(unittest.TestCase):
                 def test_test(self):
                     print('Foo')
-             """))
+             """
+            )
+        )
     dist = Distribution(params)
     dist.script_name = 'setup.py'
     cmd = test(dist)
@@ -118,54 +107,3 @@ def test_tests_are_run_once(capfd):
     cmd.run()
     out, err = capfd.readouterr()
     assert out == 'Foo\n'
-
-
-@pytest.mark.usefixtures('sample_test')
-@ack_2to3
-def test_warns_deprecation(capfd):
-    params = dict(
-        name='foo',
-        packages=['name', 'name.space', 'name.space.tests'],
-        namespace_packages=['name'],
-        test_suite='name.space.tests.test_suite',
-        use_2to3=True
-    )
-    dist = Distribution(params)
-    dist.script_name = 'setup.py'
-    cmd = test(dist)
-    cmd.ensure_finalized()
-    cmd.announce = mock.Mock()
-    cmd.run()
-    capfd.readouterr()
-    msg = (
-        "WARNING: Testing via this command is deprecated and will be "
-        "removed in a future version. Users looking for a generic test "
-        "entry point independent of test runner are encouraged to use "
-        "tox."
-    )
-    cmd.announce.assert_any_call(msg, log.WARN)
-
-
-@pytest.mark.usefixtures('sample_test')
-@ack_2to3
-def test_deprecation_stderr(capfd):
-    params = dict(
-        name='foo',
-        packages=['name', 'name.space', 'name.space.tests'],
-        namespace_packages=['name'],
-        test_suite='name.space.tests.test_suite',
-        use_2to3=True
-    )
-    dist = Distribution(params)
-    dist.script_name = 'setup.py'
-    cmd = test(dist)
-    cmd.ensure_finalized()
-    cmd.run()
-    out, err = capfd.readouterr()
-    msg = (
-        "WARNING: Testing via this command is deprecated and will be "
-        "removed in a future version. Users looking for a generic test "
-        "entry point independent of test runner are encouraged to use "
-        "tox.\n"
-    )
-    assert msg in err