From 58799d344902ca419cba3b4cffd46b8edeb7d3fe Mon Sep 17 00:00:00 2001
From: Thomas Grainger <tagrain@gmail.com>
Date: Thu, 22 Jul 2021 20:17:21 +0100
Subject: remove 2to3

---
 distutils/command/build_py.py      | 26 +-------------------------
 distutils/command/build_scripts.py | 10 +---------
 2 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'distutils/command')

diff --git a/distutils/command/build_py.py b/distutils/command/build_py.py
index edc2171c..7ef9bcef 100644
--- a/distutils/command/build_py.py
+++ b/distutils/command/build_py.py
@@ -9,7 +9,7 @@ import glob
 
 from distutils.core import Command
 from distutils.errors import *
-from distutils.util import convert_path, Mixin2to3
+from distutils.util import convert_path
 from distutils import log
 
 class build_py (Command):
@@ -390,27 +390,3 @@ class build_py (Command):
         if self.optimize > 0:
             byte_compile(files, optimize=self.optimize,
                          force=self.force, prefix=prefix, dry_run=self.dry_run)
-
-class build_py_2to3(build_py, Mixin2to3):
-    def run(self):
-        self.updated_files = []
-
-        # Base class code
-        if self.py_modules:
-            self.build_modules()
-        if self.packages:
-            self.build_packages()
-            self.build_package_data()
-
-        # 2to3
-        self.run_2to3(self.updated_files)
-
-        # Remaining base class code
-        self.byte_compile(self.get_outputs(include_bytecode=0))
-
-    def build_module(self, module, module_file, package):
-        res = build_py.build_module(self, module, module_file, package)
-        if res[1]:
-            # file was copied
-            self.updated_files.append(res[0])
-        return res
diff --git a/distutils/command/build_scripts.py b/distutils/command/build_scripts.py
index ccc70e64..e3312cf0 100644
--- a/distutils/command/build_scripts.py
+++ b/distutils/command/build_scripts.py
@@ -7,7 +7,7 @@ from stat import ST_MODE
 from distutils import sysconfig
 from distutils.core import Command
 from distutils.dep_util import newer
-from distutils.util import convert_path, Mixin2to3
+from distutils.util import convert_path
 from distutils import log
 import tokenize
 
@@ -150,11 +150,3 @@ class build_scripts(Command):
                         os.chmod(file, newmode)
         # XXX should we modify self.outfiles?
         return outfiles, updated_files
-
-class build_scripts_2to3(build_scripts, Mixin2to3):
-
-    def copy_scripts(self):
-        outfiles, updated_files = build_scripts.copy_scripts(self)
-        if not self.dry_run:
-            self.run_2to3(updated_files)
-        return outfiles, updated_files
-- 
cgit v1.2.1