summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2022-10-07 19:56:29 (GMT)
committerGitHub <noreply@github.com>2022-10-07 19:56:29 (GMT)
commita3a3701fec80599f19da0faf6547cfbe58fcad13 (patch)
tree3267e85b6d10df4cc8f9d4a5f5861c1d983fc8e5 /Lib
parente73cb54a063ddfc1530031e95c23209ed2883a82 (diff)
downloadcpython-a3a3701fec80599f19da0faf6547cfbe58fcad13.zip
cpython-a3a3701fec80599f19da0faf6547cfbe58fcad13.tar.gz
cpython-a3a3701fec80599f19da0faf6547cfbe58fcad13.tar.bz2
GH-96073: Fix wild replacement in inspect.formatannotation (GH-96074)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com> (cherry picked from commit d5fea01d9d439b1638cd8e5db19c33909841d86f) Co-authored-by: Anh71me <iyumelive@gmail.com>
Diffstat (limited to 'Lib')
-rw-r--r--Lib/inspect.py5
-rw-r--r--Lib/test/test_inspect.py7
-rw-r--r--Lib/test/typinganndata/__init__.py0
-rw-r--r--Lib/test/typinganndata/ann_module9.py14
4 files changed, 25 insertions, 1 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 01df575..60740c6 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -1356,7 +1356,10 @@ def getargvalues(frame):
def formatannotation(annotation, base_module=None):
if getattr(annotation, '__module__', None) == 'typing':
- return repr(annotation).replace('typing.', '')
+ def repl(match):
+ text = match.group()
+ return text.removeprefix('typing.')
+ return re.sub(r'[\w\.]+', repl, repr(annotation))
if isinstance(annotation, types.GenericAlias):
return str(annotation)
if isinstance(annotation, type):
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index eaefe94..16fef5c 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -1418,6 +1418,13 @@ class TestClassesAndFunctions(unittest.TestCase):
self.assertEqual(inspect.get_annotations(isa.MyClassWithLocalAnnotations, eval_str=True), {'x': int})
+class TestFormatAnnotation(unittest.TestCase):
+ def test_typing_replacement(self):
+ from test.typinganndata.ann_module9 import ann, ann1
+ self.assertEqual(inspect.formatannotation(ann), 'Union[List[str], int]')
+ self.assertEqual(inspect.formatannotation(ann1), 'Union[List[testModule.typing.A], int]')
+
+
class TestIsDataDescriptor(unittest.TestCase):
def test_custom_descriptors(self):
diff --git a/Lib/test/typinganndata/__init__.py b/Lib/test/typinganndata/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Lib/test/typinganndata/__init__.py
diff --git a/Lib/test/typinganndata/ann_module9.py b/Lib/test/typinganndata/ann_module9.py
new file mode 100644
index 0000000..9522173
--- /dev/null
+++ b/Lib/test/typinganndata/ann_module9.py
@@ -0,0 +1,14 @@
+# Test ``inspect.formatannotation``
+# https://github.com/python/cpython/issues/96073
+
+from typing import Union, List
+
+ann = Union[List[str], int]
+
+# mock typing._type_repr behaviour
+class A: ...
+
+A.__module__ = 'testModule.typing'
+A.__qualname__ = 'A'
+
+ann1 = Union[List[A], int]