diff --git a/CHANGES b/CHANGES index 55ccdf146a0..2ed4c74924a 100644 --- a/CHANGES +++ b/CHANGES @@ -62,8 +62,8 @@ Bugs fixed * #9504: autodoc: generate incorrect reference to the parent class if the target class inherites the class having ``_name`` attribute -* #9537: autodoc: Some objects under ``typing`` module are not displayed well - with the HEAD of 3.10 +* #9537, #9589: autodoc: Some objects under ``typing`` module are not displayed + well with the HEAD of 3.10 * #9512: sphinx-build: crashed with the HEAD of Python 3.10 Testing diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py index 78b0b5b0ad8..cf4318cdabb 100644 --- a/sphinx/util/typing.py +++ b/sphinx/util/typing.py @@ -315,6 +315,8 @@ def stringify(annotation: Any) -> str: return 'None' elif annotation in INVALID_BUILTIN_CLASSES: return INVALID_BUILTIN_CLASSES[annotation] + elif str(annotation).startswith('typing.Annotated'): # for py310+ + pass elif (getattr(annotation, '__module__', None) == 'builtins' and getattr(annotation, '__qualname__', None)): if hasattr(annotation, '__args__'): # PEP 585 generic