extra/python-setuptools: removed bootstrapping hacks around python2to3

2 files changed, 0 insertions, 50 deletions

diff --git a/extra/python-setuptools/PKGBUILD b/extra/python-setuptools/PKGBUILD
index eba890bf..5f048dbd 100644
--- a/extra/python-setuptools/PKGBUILD
+++ b/extra/python-setuptools/PKGBUILD
@@ -22,15 +22,3 @@ makedepends=(${makedepends[@]//python2-setuptools/})
 depends=(${depends[@]//python-pyparsing/})
 depends=(${depends[@]//python2-pyparsing/})
 makedepends+=(python python2)
-
-# bootstrapping without python2 broken stuff
-source+=('setuptools-57.4.0-no-2to3.patch')
-sha512sums+=('cb9a654825dfea7f61b394d4d7e06202569efc7f8efac5527c3653c111b349ebe182b50332d41760e1585685923b7a17d8bb3e4ada48d33aebc4c2e379e2342c')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /cd/ a \
-        patch -Np1 -i "${srcdir}"/setuptools-57.4.0-no-2to3.patch
-      '
-)"
diff --git a/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch b/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch
deleted file mode 100644
index bcd24e18..00000000
--- a/extra/python-setuptools/setuptools-57.4.0-no-2to3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -rauN setuptools-57.4.0/setup.cfg setuptools-57.4.0-no-2to3-patch/setup.cfg
---- setuptools-57.4.0/setup.cfg	2021-07-19 02:30:57.000000000 +0200
-+++ setuptools-57.4.0-no-2to3-patch/setup.cfg	2021-12-29 19:43:52.034173281 +0100
-@@ -108,7 +108,6 @@
- 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
-@@ -127,10 +126,6 @@
- 	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
-diff -rauN setuptools-57.4.0/setuptools/command/build_py.py setuptools-57.4.0-no-2to3-patch/setuptools/command/build_py.py
---- setuptools-57.4.0/setuptools/command/build_py.py	2021-07-19 02:30:57.000000000 +0200
-+++ setuptools-57.4.0-no-2to3-patch/setuptools/command/build_py.py	2021-12-29 19:46:48.627752136 +0100
-@@ -123,9 +123,9 @@
-                 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)
-+#                if (copied and
-+#                        srcfile in self.distribution.convert_2to3_doctests):
-+#                    self.__doctests_2to3.append(outf)
- 
-     def analyze_manifest(self):
-         self.manifest_files = mf = {}