From 4f3e53f811945ff376b37b58433bbe89b1adfa1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 2 Jul 2024 19:33:19 +0200 Subject: [PATCH] [3.13] gh-121279: Re-add prematurely removed import warnings to importlib.abc Fixup for 51724620e868512bbedb1547aca441bcd27bbe0c Fixes https://github.com/python/cpython/issues/121279 --- Lib/importlib/abc.py | 1 + Lib/test/test_importlib/test_abc.py | 22 +++++++++++++++++++ ...-07-02-19-36-54.gh-issue-121279.BltDo9.rst | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2024-07-02-19-36-54.gh-issue-121279.BltDo9.rst diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index 16b96266b51be0..37fef357fe2c0c 100644 --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -13,6 +13,7 @@ _frozen_importlib_external = _bootstrap_external from ._abc import Loader import abc +import warnings from .resources import abc as _resources_abc diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py index 603125f6d926f6..479039055ca75f 100644 --- a/Lib/test/test_importlib/test_abc.py +++ b/Lib/test/test_importlib/test_abc.py @@ -913,5 +913,27 @@ def test_universal_newlines(self): SourceOnlyLoaderMock=SPLIT_SOL) +class DeprecatedAttrsTests: + + """Test the deprecated attributes can be accessed.""" + + def test_deprecated_attr_ResourceReader(self): + with self.assertWarns(DeprecationWarning): + self.abc.ResourceReader + + def test_deprecated_attr_Traversable(self): + with self.assertWarns(DeprecationWarning): + self.abc.Traversable + + def test_deprecated_attr_TraversableResources(self): + with self.assertWarns(DeprecationWarning): + self.abc.TraversableResources + + +(Frozen_DeprecatedAttrsTests, + Source_DeprecatedAttrsTests + ) = test_util.test_both(DeprecatedAttrsTests, abc=abc) + + if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS.d/next/Library/2024-07-02-19-36-54.gh-issue-121279.BltDo9.rst b/Misc/NEWS.d/next/Library/2024-07-02-19-36-54.gh-issue-121279.BltDo9.rst new file mode 100644 index 00000000000000..709a37885a750d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-07-02-19-36-54.gh-issue-121279.BltDo9.rst @@ -0,0 +1,2 @@ +Avoid :exc:`NameError` for the :mod:`warnings` module when accessing the +depracated atributes of the :mod:`importlib.abc` module.