diff options
| author | Anderson Bravalheri <andersonbravalheri@gmail.com> | 2022-02-04 11:16:12 +0000 |
|---|---|---|
| committer | Anderson Bravalheri <andersonbravalheri@gmail.com> | 2022-03-05 09:58:49 +0000 |
| commit | ccd2f073171065ad8fe65215ff837644689c6d85 (patch) | |
| tree | f7ecc0d0132c13f814740a53397d68db064523cf | |
| parent | 73715080cf0fbd5ae65b4f0f5af0e651adda7234 (diff) | |
| download | python-setuptools-git-ccd2f073171065ad8fe65215ff837644689c6d85.tar.gz | |
Ensure relative imports for vendorised tomli
| -rw-r--r-- | setuptools/_vendor/tomli/__init__.py | 4 | ||||
| -rw-r--r-- | setuptools/_vendor/tomli/_parser.py | 4 | ||||
| -rw-r--r-- | setuptools/_vendor/tomli/_re.py | 2 | ||||
| -rw-r--r-- | tools/vendored.py | 11 |
4 files changed, 16 insertions, 5 deletions
diff --git a/setuptools/_vendor/tomli/__init__.py b/setuptools/_vendor/tomli/__init__.py index 60f792af..0ac89c82 100644 --- a/setuptools/_vendor/tomli/__init__.py +++ b/setuptools/_vendor/tomli/__init__.py @@ -3,7 +3,7 @@ __all__ = ("loads", "load", "TOMLDecodeError") __version__ = "1.2.3" # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT -from tomli._parser import TOMLDecodeError, load, loads +from ._parser import TOMLDecodeError, load, loads # Pretend this exception was created here. -TOMLDecodeError.__module__ = "tomli" +TOMLDecodeError.__module__ = "setuptools.extern.tomli" diff --git a/setuptools/_vendor/tomli/_parser.py b/setuptools/_vendor/tomli/_parser.py index 89e81c3b..093afe50 100644 --- a/setuptools/_vendor/tomli/_parser.py +++ b/setuptools/_vendor/tomli/_parser.py @@ -3,7 +3,7 @@ from types import MappingProxyType from typing import Any, BinaryIO, Dict, FrozenSet, Iterable, NamedTuple, Optional, Tuple import warnings -from tomli._re import ( +from ._re import ( RE_DATETIME, RE_LOCALTIME, RE_NUMBER, @@ -11,7 +11,7 @@ from tomli._re import ( match_to_localtime, match_to_number, ) -from tomli._types import Key, ParseFloat, Pos +from ._types import Key, ParseFloat, Pos ASCII_CTRL = frozenset(chr(i) for i in range(32)) | frozenset(chr(127)) diff --git a/setuptools/_vendor/tomli/_re.py b/setuptools/_vendor/tomli/_re.py index 9dc9e903..45e17e2c 100644 --- a/setuptools/_vendor/tomli/_re.py +++ b/setuptools/_vendor/tomli/_re.py @@ -3,7 +3,7 @@ from functools import lru_cache import re from typing import Any, Optional, Union -from tomli._types import ParseFloat +from ._types import ParseFloat # E.g. # - 00:32:00.999999 diff --git a/tools/vendored.py b/tools/vendored.py index 53185437..c1839711 100644 --- a/tools/vendored.py +++ b/tools/vendored.py @@ -94,6 +94,16 @@ def rewrite_more_itertools(pkg_files: Path): more_file.write_text(text) +def rewrite_tomli(pkg_files, new_root): + """ + Rewrite imports in tomli to use the relative form. + """ + for file in pkg_files.glob('*.py'): + text = file.read_text().replace('tomli.', '.') + text = text.replace('tomli', f'{new_root}.tomli') + file.write_text(text) + + def clean(vendor): """ Remove all files out of the vendor directory except the meta @@ -139,6 +149,7 @@ def update_setuptools(): rewrite_importlib_resources(vendor / 'importlib_resources', 'setuptools.extern') rewrite_importlib_metadata(vendor / 'importlib_metadata', 'setuptools.extern') rewrite_more_itertools(vendor / "more_itertools") + rewrite_tomli(vendor / 'tomli', 'setuptools.extern') def install_validate_pyproject(vendor): |