Rely on dependencies instead of vendoring them.

pypa · Sep 5, 2024 · cded66c · cded66c
1 parent 8e8f0cb
commit cded66c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 191 deletions.
diff --git a/distutils/_collections.py b/distutils/_collections.py
diff --git a/distutils/_functools.py b/distutils/_functools.py
diff --git a/distutils/_itertools.py b/distutils/_itertools.py
diff --git a/distutils/_modified.py b/distutils/_modified.py
@@ -3,7 +3,8 @@
 import functools
 import os.path
 
-from ._functools import splat
+from jaraco.functools import splat
+
 from .compat.py39 import zip_strict
 from .errors import DistutilsFileError
 

diff --git a/distutils/ccompiler.py b/distutils/ccompiler.py
@@ -9,7 +9,8 @@
 import types
 import warnings
 
-from ._itertools import always_iterable
+from more_itertools import always_iterable
+
 from ._log import log
 from ._modified import newer_group
 from .dir_util import mkpath

diff --git a/distutils/command/install.py b/distutils/command/install.py
@@ -10,7 +10,8 @@
 from distutils._log import log
 from site import USER_BASE, USER_SITE
 
-from .. import _collections
+import jaraco.collections
+
 from ..core import Command
 from ..debug import DEBUG
 from ..errors import DistutilsOptionError, DistutilsPlatformError
@@ -428,7 +429,7 @@ def finalize_options(self):  # noqa: C901
             local_vars['userbase'] = self.install_userbase
             local_vars['usersite'] = self.install_usersite
 
-        self.config_vars = _collections.DictStack([
+        self.config_vars = jaraco.collections.DictStack([
             fw.vars(),
             compat_vars,
             sysconfig.get_config_vars(),

diff --git a/distutils/command/register.py b/distutils/command/register.py
@@ -13,7 +13,8 @@
 from distutils._log import log
 from warnings import warn
 
-from .._itertools import always_iterable
+from more_itertools import always_iterable
+
 from ..core import PyPIRCCommand
 
 

diff --git a/distutils/command/upload.py b/distutils/command/upload.py
@@ -13,7 +13,8 @@
 from urllib.parse import urlparse
 from urllib.request import HTTPError, Request, urlopen
 
-from .._itertools import always_iterable
+from more_itertools import always_iterable
+
 from ..core import PyPIRCCommand
 from ..errors import DistutilsError, DistutilsOptionError
 from ..spawn import spawn

diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
@@ -16,7 +16,8 @@
 import sys
 import sysconfig
 
-from ._functools import pass_none
+from jaraco.functools import pass_none
+
 from .compat import py39
 from .errors import DistutilsPlatformError
 from .util import is_mingw

diff --git a/distutils/util.py b/distutils/util.py
@@ -17,7 +17,8 @@
 import sysconfig
 import tempfile
 
-from ._functools import pass_none
+from jaraco.functools import pass_none
+
 from ._log import log
 from ._modified import newer
 from .errors import DistutilsByteCompileError, DistutilsPlatformError

diff --git a/pyproject.toml b/pyproject.toml
@@ -20,6 +20,9 @@ requires-python = ">=3.8"
 dependencies = [
 	# Setuptools must require these
 	"packaging",
+	"jaraco.functools",
+	"more_itertools",
+	"jaraco.collections",
 ]
 dynamic = ["version"]