Merge pull request #4212 from pypa/refactor/compat-module

Move compatibility modules into a compat package.
pypa · Feb 8, 2024 · c0fd10e · c0fd10e
2 parents 7315375 + 5d6120a
commit c0fd10e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
@@ -74,7 +74,7 @@
     DEVELOP_DIST,
 )
 import pkg_resources
-from .. import py312compat
+from ..compat import py311
 from .._path import ensure_directory
 from ..extern.jaraco.text import yield_lines
 
@@ -2329,7 +2329,7 @@ def load_launcher_manifest(name):
 
 
 def _rmtree(path, ignore_errors=False, onexc=auto_chmod):
-    return py312compat.shutil_rmtree(path, ignore_errors, onexc)
+    return py311.shutil_rmtree(path, ignore_errors, onexc)
 
 
 def current_umask():

diff --git a/setuptools/compat/__init__.py b/setuptools/compat/__init__.py
diff --git a/setuptools/py311compat.py → setuptools/compat/py310.py b/setuptools/py311compat.py → setuptools/compat/py310.py
diff --git a/setuptools/py312compat.py → setuptools/compat/py311.py b/setuptools/py312compat.py → setuptools/compat/py311.py
diff --git a/setuptools/config/pyprojecttoml.py b/setuptools/config/pyprojecttoml.py
@@ -29,7 +29,7 @@
 
 
 def load_file(filepath: _Path) -> dict:
-    from ..py311compat import tomllib
+    from ..compat.py310 import tomllib
 
     with open(filepath, "rb") as file:
         return tomllib.load(file)