Also do non-qualified tuples

Author: flying-sheep

scanpydoc/elegant_typehints.py

@@ -67,17 +67,19 @@ def _init_vars(app: Sphinx, config: Config):
     config.html_static_path.append(str(HERE / "static"))
 
 
+def _fixup(fmt: str) -> str:
+    # work around https://github.com/agronholm/sphinx-autodoc-typehints/issues/94
+    fmt = fmt.replace(":py:class:`typing.Tuple`", ":py:data:`typing.Tuple`")
+    fmt = fmt.replace(":py:class:`~typing.Tuple`", ":py:data:`~typing.Tuple`")
+    return fmt
+
+
 def _format_full(annotation: Type[Any], fully_qualified: bool = False):
     if inspect.isclass(annotation) and annotation.__module__ == "builtins":
         return _format_orig(annotation, fully_qualified)
     annotation_cls = annotation if inspect.isclass(annotation) else type(annotation)
     if annotation_cls.__module__ == "typing":
-        formatted = _format_orig(annotation, fully_qualified)
-        # work around https://github.com/agronholm/sphinx-autodoc-typehints/issues/94
-        formatted = formatted.replace(
-            ":py:class:`typing.Tuple`", ":py:data:`typing.Tuple`"
-        )
-        return formatted
+        return _fixup(_format_orig(annotation, fully_qualified))
 
     # Only if this is a real class we override sphinx_autodoc_typehints
     if inspect.isclass(annotation) or inspect.isclass(
@@ -88,7 +90,7 @@ def _format_full(annotation: Type[Any], fully_qualified: bool = False):
         if override is not None:
             return f":py:class:`{'' if fully_qualified else '~'}{override}`"
 
-    return _format_orig(annotation, fully_qualified)
+    return _fixup(_format_orig(annotation, fully_qualified))
 
 
 def _format_terse(annotation: Type[Any], fully_qualified: bool = False) -> str:

tests/test_elegant_typehints.py

@@ -118,3 +118,11 @@ def test_typing_classes(app, annotation, formatter):
         elif len(annotation.__args__) == 2 and type(None) in annotation.__args__:
             name = "Optional"
     assert formatter(annotation, True).startswith(f":py:data:`typing.{name}")
+
+
+def test_typing_class_nested(app):
+    assert _format_full(t.Optional[t.Tuple[int, str]]) == (
+        ":py:data:`~typing.Optional`\\["
+        ":py:data:`~typing.Tuple`\\[:py:class:`int`, :py:class:`str`]"
+        "]"
+    )