Skip to content

Commit c0fd10e

Browse files
authored
Merge pull request #4212 from pypa/refactor/compat-module
Move compatibility modules into a compat package.
2 parents 7315375 + 5d6120a commit c0fd10e

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed

setuptools/command/easy_install.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
DEVELOP_DIST,
7575
)
7676
import pkg_resources
77-
from .. import py312compat
77+
from ..compat import py311
7878
from .._path import ensure_directory
7979
from ..extern.jaraco.text import yield_lines
8080

@@ -2329,7 +2329,7 @@ def load_launcher_manifest(name):
23292329

23302330

23312331
def _rmtree(path, ignore_errors=False, onexc=auto_chmod):
2332-
return py312compat.shutil_rmtree(path, ignore_errors, onexc)
2332+
return py311.shutil_rmtree(path, ignore_errors, onexc)
23332333

23342334

23352335
def current_umask():

setuptools/compat/__init__.py

Whitespace-only changes.
File renamed without changes.
File renamed without changes.

setuptools/config/pyprojecttoml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
def load_file(filepath: _Path) -> dict:
32-
from ..py311compat import tomllib
32+
from ..compat.py310 import tomllib
3333

3434
with open(filepath, "rb") as file:
3535
return tomllib.load(file)

0 commit comments

Comments
 (0)