mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bpo-44784: Apply changes from importlib_metadata 4.6.3 (GH-27508) (#27510)

Browse source 
Addressing issues with tests under error on warnings.

Automerge-Triggered-By: GH:jaraco
(cherry picked from commit 1cf8424a62)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
This commit is contained in:
Miss Islington (bot) 2021-07-31 20:01:38 -07:00 • committed by GitHub
parent 35035bc35a
commit 21d5897982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_importlib/test_metadata_api.py
View file

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

2
Misc/NEWS.d/next/Library/2021-07-31-08-45-31.bpo-44784.fIMIDS.rst Normal file
View file

@ -0,0 +1,2 @@
In importlib.metadata tests, override warnings behavior under expected
DeprecationWarnings (importlib_metadata 4.6.3).