Skip to content

Commit cded66c

Browse files
committed
Rely on dependencies instead of vendoring them.
1 parent 8e8f0cb commit cded66c

File tree

11 files changed

+18
-191
lines changed

11 files changed

+18
-191
lines changed

distutils/_collections.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

distutils/_functools.py

Lines changed: 0 additions & 73 deletions
This file was deleted.

distutils/_itertools.py

Lines changed: 0 additions & 52 deletions
This file was deleted.

distutils/_modified.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import functools
44
import os.path
55

6-
from ._functools import splat
6+
from jaraco.functools import splat
7+
78
from .compat.py39 import zip_strict
89
from .errors import DistutilsFileError
910

distutils/ccompiler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
import types
1010
import warnings
1111

12-
from ._itertools import always_iterable
12+
from more_itertools import always_iterable
13+
1314
from ._log import log
1415
from ._modified import newer_group
1516
from .dir_util import mkpath

distutils/command/install.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from distutils._log import log
1111
from site import USER_BASE, USER_SITE
1212

13-
from .. import _collections
13+
import jaraco.collections
14+
1415
from ..core import Command
1516
from ..debug import DEBUG
1617
from ..errors import DistutilsOptionError, DistutilsPlatformError
@@ -428,7 +429,7 @@ def finalize_options(self): # noqa: C901
428429
local_vars['userbase'] = self.install_userbase
429430
local_vars['usersite'] = self.install_usersite
430431

431-
self.config_vars = _collections.DictStack([
432+
self.config_vars = jaraco.collections.DictStack([
432433
fw.vars(),
433434
compat_vars,
434435
sysconfig.get_config_vars(),

distutils/command/register.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from distutils._log import log
1414
from warnings import warn
1515

16-
from .._itertools import always_iterable
16+
from more_itertools import always_iterable
17+
1718
from ..core import PyPIRCCommand
1819

1920

distutils/command/upload.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from urllib.parse import urlparse
1414
from urllib.request import HTTPError, Request, urlopen
1515

16-
from .._itertools import always_iterable
16+
from more_itertools import always_iterable
17+
1718
from ..core import PyPIRCCommand
1819
from ..errors import DistutilsError, DistutilsOptionError
1920
from ..spawn import spawn

distutils/sysconfig.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
import sys
1717
import sysconfig
1818

19-
from ._functools import pass_none
19+
from jaraco.functools import pass_none
20+
2021
from .compat import py39
2122
from .errors import DistutilsPlatformError
2223
from .util import is_mingw

distutils/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
import sysconfig
1818
import tempfile
1919

20-
from ._functools import pass_none
20+
from jaraco.functools import pass_none
21+
2122
from ._log import log
2223
from ._modified import newer
2324
from .errors import DistutilsByteCompileError, DistutilsPlatformError

0 commit comments

Comments
 (0)