Merge tag 'v4.6.3' into cpython

Author: jaraco

Lib/importlib/metadata/__init__.py

@@ -7,7 +7,6 @@
 import pathlib
 import zipfile
 import operator
-import platform
 import textwrap
 import warnings
 import functools
@@ -45,16 +44,6 @@
 ]
 
 
-def _pypy_partial(val):
-    """
-    Adjust for variable stacklevel on partial under PyPy.
-
-    Workaround for #327.
-    """
-    is_pypy = platform.python_implementation() == 'PyPy'
-    return val + is_pypy
-
-
 class PackageNotFoundError(ModuleNotFoundError):
     """The package was not found."""
 
@@ -251,7 +240,7 @@ class DeprecatedList(list):
         warnings.warn,
         "EntryPoints list interface is deprecated. Cast to list if needed.",
         DeprecationWarning,
-        stacklevel=_pypy_partial(2),
+        stacklevel=2,
     )
 
     def __setitem__(self, *args, **kwargs):
@@ -400,7 +389,7 @@ class Deprecated:
         warnings.warn,
         "SelectableGroups dict interface is deprecated. Use select.",
         DeprecationWarning,
-        stacklevel=_pypy_partial(2),
+        stacklevel=2,
     )
 
     def __getitem__(self, name):