GH-96073: Fix wild replacement in inspect.formatannotation (GH-96074) · python/cpython@107ba92 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 36.1k
• Star 77.2k

• Code
• Issues 5k+
• Pull requests 2.7k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 107ba92

Browse filesBrowse the repository at this point in the historyBrowse files

miss-islington

and

iyume

authored

GH-96073: Fix wild replacement in inspect.formatannotation (GH-96074)

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com> (cherry picked from commit d5fea01) Co-authored-by: Anh71me <iyumelive@gmail.com>

1 parent a421c87 commit 107ba92
Copy full SHA for 107ba92

5 files changed

+26-1Lines changed: 26 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib
  • inspect.py
  • test
    • test_inspect.py
    • typinganndata
      • __init__.py
      • ann_module9.py
• Misc/NEWS.d/next/Library
  • 2022-08-29-12-35-28.gh-issue-96073.WaGstf.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/inspect.py‎

Copy file name to clipboardExpand all lines: Lib/inspect.py

+4-1Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1448,7 +1448,10 @@ def getargvalues(frame):
1448	1448
1449	1449	def formatannotation(annotation, base_module=None):
1450	1450	if getattr(annotation, '__module__', None) == 'typing':
1451		- return repr(annotation).replace('typing.', '')
	1451	+ def repl(match):
	1452	+ text = match.group()
	1453	+ return text.removeprefix('typing.')
	1454	+ return re.sub(r'[\w\.]+', repl, repr(annotation))
1452	1455	if isinstance(annotation, types.GenericAlias):
1453	1456	return str(annotation)
1454	1457	if isinstance(annotation, type):

Collapse file

‎Lib/test/test_inspect.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_inspect.py

+7Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1421,6 +1421,13 @@ def wrapper(a, b):
1421	1421	self.assertEqual(inspect.get_annotations(isa.MyClassWithLocalAnnotations, eval_str=True), {'x': int})
1422	1422
1423	1423
	1424	+ class TestFormatAnnotation(unittest.TestCase):
	1425	+ def test_typing_replacement(self):
	1426	+ from test.typinganndata.ann_module9 import ann, ann1
	1427	+ self.assertEqual(inspect.formatannotation(ann), 'Union[List[str], int]')
	1428	+ self.assertEqual(inspect.formatannotation(ann1), 'Union[List[testModule.typing.A], int]')
	1429	+
	1430	+
1424	1431	class TestIsDataDescriptor(unittest.TestCase):
1425	1432
1426	1433	def test_custom_descriptors(self):

Collapse file

‎Lib/test/typinganndata/__init__.py‎

Copy file name to clipboardExpand all lines: Lib/test/typinganndata/__init__.py

Whitespace-only changes.

Collapse file

‎Lib/test/typinganndata/ann_module9.py‎

Copy file name to clipboard

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,14 @@
	1	+ # Test ``inspect.formatannotation``
	2	+ # https://github.com/python/cpython/issues/96073
	3	+
	4	+ from typing import Union, List
	5	+
	6	+ ann = Union[List[str], int]
	7	+
	8	+ # mock typing._type_repr behaviour
	9	+ class A: ...
	10	+
	11	+ A.__module__ = 'testModule.typing'
	12	+ A.__qualname__ = 'A'
	13	+
	14	+ ann1 = Union[List[A], int]

Collapse file

‎Misc/NEWS.d/next/Library/2022-08-29-12-35-28.gh-issue-96073.WaGstf.rst‎

Copy file name to clipboard

+1Lines changed: 1 addition & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ In :mod:`inspect`, fix overeager replacement of "`typing.`" in formatting annotations.

0 commit comments

Comments

0 (0)