]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-115570: Fix DeprecationWarnings in test_typing (#115571) (#115574)
authorJelle Zijlstra <jelle.zijlstra@gmail.com>
Fri, 16 Feb 2024 21:46:48 +0000 (13:46 -0800)
committerGitHub <noreply@github.com>
Fri, 16 Feb 2024 21:46:48 +0000 (13:46 -0800)
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Lib/test/test_typing.py
Lib/typing.py
Misc/NEWS.d/next/Library/2024-02-16-10-18-25.gh-issue-115570.bI6uu3.rst [new file with mode: 0644]

index ab9d8a0a20ce7de595d823b6587fa5672c3e6d04..7f9c10dd2a54e6bd4411d7007bb17ad41715beb5 100644 (file)
@@ -8123,6 +8123,17 @@ class RETests(BaseTestCase):
             self.assertEqual(__name__, 'typing.re')
             self.assertEqual(len(w), 1)
 
+    def test_re_submodule_access_basics(self):
+        with warnings.catch_warnings():
+            warnings.filterwarnings("error", category=DeprecationWarning)
+            from typing import re
+            self.assertIsInstance(re.__doc__, str)
+            self.assertEqual(re.__name__, "typing.re")
+            self.assertIsInstance(re.__dict__, types.MappingProxyType)
+
+        with self.assertWarns(DeprecationWarning):
+            re.Match
+
     def test_cannot_subclass(self):
         with self.assertRaisesRegex(
             TypeError,
index cbd4ce8bfaa6bbc0541de36a102070fa1708f5d3..1e4c725be473b74eb247e1017eb1b3648d2b3f44 100644 (file)
@@ -3256,11 +3256,11 @@ class TextIO(IO[str]):
 
 class _DeprecatedType(type):
     def __getattribute__(cls, name):
-        if name not in ("__dict__", "__module__") and name in cls.__dict__:
+        if name not in {"__dict__", "__module__", "__doc__"} and name in cls.__dict__:
             warnings.warn(
                 f"{cls.__name__} is deprecated, import directly "
                 f"from typing instead. {cls.__name__} will be removed "
-                "in Python 3.12.",
+                "in Python 3.13.",
                 DeprecationWarning,
                 stacklevel=2,
             )
diff --git a/Misc/NEWS.d/next/Library/2024-02-16-10-18-25.gh-issue-115570.bI6uu3.rst b/Misc/NEWS.d/next/Library/2024-02-16-10-18-25.gh-issue-115570.bI6uu3.rst
new file mode 100644 (file)
index 0000000..f3c8a11
--- /dev/null
@@ -0,0 +1,3 @@
+A :exc:`DeprecationWarning` is no longer omitted on access to the
+``__doc__`` attributes of the deprecated ``typing.io`` and ``typing.re``
+pseudo-modules.