Merge pull request #13370 from sbidoul/tomllib-compat-sbi

DRY tomllib compatibility

Author: sbidoul

src/pip/_internal/pyproject.py

@@ -1,21 +1,16 @@
 import importlib.util
 import os
-import sys
 from collections import namedtuple
 from typing import Any, List, Optional
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    from pip._vendor import tomli as tomllib
-
 from pip._vendor.packaging.requirements import InvalidRequirement
 
 from pip._internal.exceptions import (
     InstallationError,
     InvalidPyProjectBuildRequires,
     MissingPyProjectBuildRequires,
 )
+from pip._internal.utils.compat import tomllib
 from pip._internal.utils.packaging import get_requirement
 
 

src/pip/_internal/req/req_dependency_group.py

@@ -1,14 +1,9 @@
-import sys
 from typing import Any, Dict, Iterable, Iterator, List, Tuple
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    from pip._vendor import tomli as tomllib
-
 from pip._vendor.dependency_groups import DependencyGroupResolver
 
 from pip._internal.exceptions import InstallationError
+from pip._internal.utils.compat import tomllib
 
 
 def parse_dependency_groups(groups: List[Tuple[str, str]]) -> List[str]:

src/pip/_internal/utils/compat.py

@@ -7,7 +7,7 @@
 import sys
 from typing import IO
 
-__all__ = ["get_path_uid", "stdlib_pkgs", "WINDOWS"]
+__all__ = ["get_path_uid", "stdlib_pkgs", "tomllib", "WINDOWS"]
 
 
 logger = logging.getLogger(__name__)
@@ -67,6 +67,12 @@ def open_text_resource(
         )
 
 
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    from pip._vendor import tomli as tomllib
+
+
 # packages in the stdlib that may have installation metadata, but should not be
 # considered 'installed'.  this theoretically could be determined based on
 # dist.location (py27:`sysconfig.get_paths()['stdlib']`,

tests/functional/test_lock.py

@@ -1,16 +1,11 @@
-import sys
 import textwrap
 from pathlib import Path
 
+from pip._internal.utils.compat import tomllib
 from pip._internal.utils.urls import path_to_url
 
 from ..lib import PipTestEnvironment, TestData
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    from pip._vendor import tomli as tomllib
-
 
 def test_lock_wheel_from_findlinks(
     script: PipTestEnvironment, shared_data: TestData, tmp_path: Path