remove lib2to3 usage

Author: graingert

docs/deprecated/python3.rst

@@ -330,21 +330,6 @@ Keywords
     mess with it.  For more details on how this argument works, see the section
     below on :ref:`Automatic Resource Extraction`.
 
-``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`../deprecated/python3` for more details.
-
-``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3.
-    See :doc:`../deprecated/python3` for more details.
-
-``use_2to3_fixers``
-    A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`../deprecated/python3` for more details.
-
-``use_2to3_exclude_fixers``
-    List of fixer names to be skipped.
-
 ``project_urls``
     An arbitrary map of URL names to hyperlinks, allowing more extensible
     documentation of where various resources can be found than the simple

docs/references/keywords.rst

@@ -211,10 +211,6 @@ install_requires         list-semi
 extras_require           section                                              [#opt-2]_
 python_requires          str
 entry_points             file:, section                       51.0.0
-use_2to3                 bool
-use_2to3_fixers          list-comma
-use_2to3_exclude_fixers  list-comma
-convert_2to3_doctests    list-comma
 scripts                  list-comma
 eager_resources          list-comma
 dependency_links         list-comma

docs/userguide/declarative_config.rst

@@ -28,14 +28,6 @@ Python's ``site-packages`` directory, it will also update the
 ``easy-install.pth`` file to include your project's source code, thereby making
 it available on ``sys.path`` for all programs using that Python installation.
 
-If you have enabled the ``use_2to3`` flag, then of course the ``.egg-link``
-will not link directly to your source code when run under Python 3, since
-that source code would be made for Python 2 and not work under Python 3.
-Instead the ``setup.py develop`` will build Python 3 code under the ``build``
-directory, and link there. This means that after doing code changes you will
-have to run ``setup.py build`` before these changes are picked up by your
-Python 3 installation.
-
 In addition, the ``develop`` command creates wrapper scripts in the target
 script directory that will run your in-development scripts after ensuring that
 all your ``install_requires`` packages are available on ``sys.path``.

docs/userguide/development_mode.rst

@@ -157,18 +157,6 @@ unless you need the associated ``setuptools`` feature.
     mess with it.  For more details on how this argument works, see the section
     below on :ref:`Automatic Resource Extraction`.
 
-``use_2to3``
-    Convert the source code from Python 2 to Python 3 with 2to3 during the
-    build process. See :doc:`../deprecated/python3` for more details.
-
-``convert_2to3_doctests``
-    List of doctest source files that need to be converted with 2to3.
-    See :doc:`../deprecated/python3` for more details.
-
-``use_2to3_fixers``
-    A list of modules to search for additional fixers to be used during
-    the 2to3 conversion. See :doc:`../deprecated/python3` for more details.
-
 ``project_urls``
     An arbitrary map of URL names to hyperlinks, allowing more extensible
     documentation of where various resources can be found than the simple

docs/userguide/keywords.rst

@@ -26,6 +26,3 @@ filterwarnings=
     ignore:Parent module 'setuptools' not found while handling absolute import:RuntimeWarning
     # Suppress use of bytes for filenames on Windows until fixed #2016
     ignore:The Windows bytes API has been deprecated:DeprecationWarning
-    # https://github.com/pypa/setuptools/issues/2081
-    ignore:lib2to3 package is deprecated:PendingDeprecationWarning
-    ignore:lib2to3 package is deprecated:DeprecationWarning

pytest.ini

@@ -106,7 +106,6 @@ distutils.commands =
 setuptools.finalize_distribution_options =
 	parent_finalize = setuptools.dist:_Distribution.finalize_options
 	keywords = setuptools.dist:Distribution._finalize_setup_keywords
-	2to3_doctests = setuptools.dist:Distribution._finalize_2to3_doctests
 distutils.setup_keywords =
 	eager_resources = setuptools.dist:assert_string_list
 	namespace_packages = setuptools.dist:check_nsp
@@ -125,10 +124,6 @@ distutils.setup_keywords =
 	dependency_links = setuptools.dist:assert_string_list
 	test_loader = setuptools.dist:check_importable
 	test_runner = setuptools.dist:check_importable
-	use_2to3 = setuptools.dist:assert_bool
-	convert_2to3_doctests = setuptools.dist:assert_string_list
-	use_2to3_fixers = setuptools.dist:assert_string_list
-	use_2to3_exclude_fixers = setuptools.dist:assert_string_list
 egg_info.writers =
 	PKG-INFO = setuptools.command.egg_info:write_pkg_info
 	requires.txt = setuptools.command.egg_info:write_requirements

setup.cfg

@@ -21,21 +21,20 @@
 
 
 __all__ = [
-    'setup', 'Distribution', 'Command', 'Extension', 'Require',
+    'setup',
+    'Distribution',
+    'Command',
+    'Extension',
+    'Require',
     'SetuptoolsDeprecationWarning',
-    'find_packages', 'find_namespace_packages',
+    'find_packages',
+    'find_namespace_packages',
 ]
 
 __version__ = setuptools.version.__version__
 
 bootstrap_install_from = None
 
-# If we run 2to3 on .py files, should we also convert docstrings?
-# Default: yes; assume that we can detect doctests reliably
-run_2to3_on_doctests = True
-# Standard package names for fixer packages
-lib2to3_fixer_packages = ['lib2to3.fixes']
-
 
 class PackageFinder:
     """
@@ -60,10 +59,13 @@ def find(cls, where='.', exclude=(), include=('*',)):
         shell style wildcard patterns just like 'exclude'.
         """
 
-        return list(cls._find_packages_iter(
-            convert_path(where),
-            cls._build_filter('ez_setup', '*__pycache__', *exclude),
-            cls._build_filter(*include)))
+        return list(
+            cls._find_packages_iter(
+                convert_path(where),
+                cls._build_filter('ez_setup', '*__pycache__', *exclude),
+                cls._build_filter(*include),
+            )
+        )
 
     @classmethod
     def _find_packages_iter(cls, where, exclude, include):
@@ -82,7 +84,7 @@ def _find_packages_iter(cls, where, exclude, include):
                 package = rel_path.replace(os.path.sep, '.')
 
                 # Skip directory trees that are not valid packages
-                if ('.' in dir or not cls._looks_like_package(full_path)):
+                if '.' in dir or not cls._looks_like_package(full_path):
                     continue
 
                 # Should this package be included?
@@ -125,12 +127,10 @@ class MinimalDistribution(distutils.core.Distribution):
         A minimal version of a distribution for supporting the
         fetch_build_eggs interface.
         """
+
         def __init__(self, attrs):
             _incl = 'dependency_links', 'setup_requires'
-            filtered = {
-                k: attrs[k]
-                for k in set(_incl) & set(attrs)
-            }
+            filtered = {k: attrs[k] for k in set(_incl) & set(attrs)}
             distutils.core.Distribution.__init__(self, filtered)
 
         def finalize_options(self):
@@ -178,8 +178,9 @@ def _ensure_stringlike(self, option, what, default=None):
             setattr(self, option, default)
             return default
         elif not isinstance(val, str):
-            raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
-                                       % (option, what, val))
+            raise DistutilsOptionError(
+                "'%s' must be a %s (got `%s`)" % (option, what, val)
+            )
         return val
 
     def ensure_string_list(self, option):
@@ -200,8 +201,8 @@ def ensure_string_list(self, option):
                 ok = False
             if not ok:
                 raise DistutilsOptionError(
-                    "'%s' must be a list of strings (got %r)"
-                    % (option, val))
+                    "'%s' must be a list of strings (got %r)" % (option, val)
+                )
 
     def reinitialize_command(self, command, reinit_subcommands=0, **kw):
         cmd = _Command.reinitialize_command(self, command, reinit_subcommands)

setuptools/__init__.py

@@ -10,20 +10,12 @@
 import stat
 from setuptools.extern.more_itertools import unique_everseen
 
-try:
-    from setuptools.lib2to3_ex import Mixin2to3
-except Exception:
-
-    class Mixin2to3:
-        def run_2to3(self, files, doctests=True):
-            "do nothing"
-
 
 def make_writable(target):
     os.chmod(target, os.stat(target).st_mode | stat.S_IWRITE)
 
 
-class build_py(orig.build_py, Mixin2to3):
+class build_py(orig.build_py):
     """Enhanced 'build_py' command that includes data files with packages
 
     The data files are specified via a 'package_data' argument to 'setup()'.
@@ -36,12 +28,10 @@ class build_py(orig.build_py, Mixin2to3):
     def finalize_options(self):
         orig.build_py.finalize_options(self)
         self.package_data = self.distribution.package_data
-        self.exclude_package_data = (self.distribution.exclude_package_data or
-                                     {})
+        self.exclude_package_data = self.distribution.exclude_package_data or {}
         if 'data_files' in self.__dict__:
             del self.__dict__['data_files']
         self.__updated_files = []
-        self.__doctests_2to3 = []
 
     def run(self):
         """Build modules, packages, and copy data files to build directory"""
@@ -55,10 +45,6 @@ def run(self):
             self.build_packages()
             self.build_package_data()
 
-        self.run_2to3(self.__updated_files, False)
-        self.run_2to3(self.__updated_files, True)
-        self.run_2to3(self.__doctests_2to3, True)
-
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
         self.byte_compile(orig.build_py.get_outputs(self, include_bytecode=0))
@@ -71,8 +57,7 @@ def __getattr__(self, attr):
         return orig.build_py.__getattr__(self, attr)
 
     def build_module(self, module, module_file, package):
-        outfile, copied = orig.build_py.build_module(self, module, module_file,
-                                                     package)
+        outfile, copied = orig.build_py.build_module(self, module, module_file, package)
         if copied:
             self.__updated_files.append(outfile)
         return outfile, copied
@@ -123,9 +108,6 @@ def build_package_data(self):
                 outf, copied = self.copy_file(srcfile, target)
                 make_writable(target)
                 srcfile = os.path.abspath(srcfile)
-                if (copied and
-                        srcfile in self.distribution.convert_2to3_doctests):
-                    self.__doctests_2to3.append(outf)
 
     def analyze_manifest(self):
         self.manifest_files = mf = {}
@@ -202,18 +184,11 @@ def exclude_data_files(self, package, src_dir, files):
             package,
             src_dir,
         )
-        match_groups = (
-            fnmatch.filter(files, pattern)
-            for pattern in patterns
-        )
+        match_groups = (fnmatch.filter(files, pattern) for pattern in patterns)
         # flatten the groups of matches into an iterable of matches
         matches = itertools.chain.from_iterable(match_groups)
         bad = set(matches)
-        keepers = (
-            fn
-            for fn in files
-            if fn not in bad
-        )
+        keepers = (fn for fn in files if fn not in bad)
         # ditch dupes
         return list(unique_everseen(keepers))
 
@@ -241,12 +216,17 @@ def assert_relative(path):
         return path
     from distutils.errors import DistutilsSetupError
 
-    msg = textwrap.dedent("""
+    msg = (
+        textwrap.dedent(
+            """
         Error: setup script specifies an absolute path:
 
             %s
 
         setup() arguments must *always* be /-separated paths relative to the
         setup.py directory, *never* absolute paths.
-        """).lstrip() % path
+        """
+        ).lstrip()
+        % path
+    )
     raise DistutilsSetupError(msg)