Merge tag 'v4.6.2' into cpython

python · Jul 31, 2021 · 29c7a59 · 29c7a59
2 parents d078f9d + 5583567
commit 29c7a59
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
@@ -7,6 +7,7 @@
 import pathlib
 import zipfile
 import operator
+import platform
 import textwrap
 import warnings
 import functools
@@ -44,6 +45,16 @@
 ]
 
 
+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."""
 
@@ -240,7 +251,7 @@ class DeprecatedList(list):
         warnings.warn,
         "EntryPoints list interface is deprecated. Cast to list if needed.",
         DeprecationWarning,
-        stacklevel=2,
+        stacklevel=_pypy_partial(2),
     )
 
     def __setitem__(self, *args, **kwargs):
@@ -389,7 +400,7 @@ class Deprecated:
         warnings.warn,
         "SelectableGroups dict interface is deprecated. Use select.",
         DeprecationWarning,
-        stacklevel=2,
+        stacklevel=_pypy_partial(2),
     )
 
     def __getitem__(self, name):

diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py
@@ -3,6 +3,7 @@
 import unittest
 import warnings
 import importlib
+import contextlib
 
 from . import fixtures
 from importlib.metadata import (
@@ -17,6 +18,13 @@
 )
 
 
+@contextlib.contextmanager
+def suppress_known_deprecation():
+    with warnings.catch_warnings(record=True) as ctx:
+        warnings.simplefilter('default')
+        yield ctx
+
+
 class APITests(
     fixtures.EggInfoPkg,
     fixtures.DistInfoPkg,
@@ -118,8 +126,7 @@ def test_entry_points_dict_construction(self):
         # Prior versions of entry_points() returned simple lists and
         # allowed casting those lists into maps by name using ``dict()``.
         # Capture this now deprecated use-case.
-        with warnings.catch_warnings(record=True) as caught:
-            warnings.filterwarnings("default", category=DeprecationWarning)
+        with suppress_known_deprecation() as caught:
             eps = dict(entry_points(group='entries'))
 
         assert 'main' in eps
@@ -138,8 +145,7 @@ def test_entry_points_by_index(self):
         See python/importlib_metadata#300 and bpo-44246.
         """
         eps = distribution('distinfo-pkg').entry_points
-        with warnings.catch_warnings(record=True) as caught:
-            warnings.filterwarnings("default", category=DeprecationWarning)
+        with suppress_known_deprecation() as caught:
             eps[0]
 
         # check warning
@@ -151,7 +157,7 @@ def test_entry_points_groups_getitem(self):
         # Prior versions of entry_points() returned a dict. Ensure
         # that callers using '.__getitem__()' are supported but warned to
         # migrate.
-        with warnings.catch_warnings(record=True):
+        with suppress_known_deprecation():
             entry_points()['entries'] == entry_points(group='entries')
 
             with self.assertRaises(KeyError):
@@ -161,7 +167,7 @@ def test_entry_points_groups_get(self):
         # Prior versions of entry_points() returned a dict. Ensure
         # that callers using '.get()' are supported but warned to
         # migrate.
-        with warnings.catch_warnings(record=True):
+        with suppress_known_deprecation():
             entry_points().get('missing', 'default') == 'default'
             entry_points().get('entries', 'default') == entry_points()['entries']
             entry_points().get('missing', ()) == ()