From: Miro Hrončok <miro@hroncok.cz>
Date: Wed, 3 Jul 2024 09:06:20 +0000 (+0200)
Subject: [3.13] gh-121279: Re-add prematurely removed import warnings to importlib.abc (#121281)
X-Git-Tag: v3.13.0b4~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dacf4ffa7982e13dce87ecb61b3b21e99375298a;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-121279: Re-add prematurely removed import warnings to importlib.abc (#121281)

Fixup for 51724620e868512bbedb1547aca441bcd27bbe0c

Fixes https://github.com/python/cpython/issues/121279
---

diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
index 16b96266b51b..37fef357fe2c 100644
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -13,6 +13,7 @@ except ImportError:
     _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 603125f6d926..479039055ca7 100644
--- a/Lib/test/test_importlib/test_abc.py
+++ b/Lib/test/test_importlib/test_abc.py
@@ -913,5 +913,27 @@ class SourceLoaderGetSourceTests:
                          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 000000000000..709a37885a75
--- /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.