Fixed TypeError with generic classes having the "name" property

Fixes #118.

Author: agronholm

CHANGELOG.rst

@@ -1,3 +1,10 @@
+1.10.3
+======
+
+* Fixed ``TypeError`` (or wrong rendered class name) when an annotation is a generic class that has
+  a ``name`` property
+
+
 1.10.2
 ======
 

sphinx_autodoc_typehints.py

@@ -26,7 +26,7 @@ def get_annotation_module(annotation) -> str:
     raise ValueError('Cannot determine the module of {}'.format(annotation))
 
 
-def get_annotation_class_name(annotation) -> str:
+def get_annotation_class_name(annotation, module: str) -> str:
     # Special cases
     if annotation is None:
         return 'None'
@@ -41,7 +41,8 @@ def get_annotation_class_name(annotation) -> str:
         return annotation.__qualname__
     elif getattr(annotation, '_name', None):  # Required for generic aliases on Python 3.7+
         return annotation._name
-    elif getattr(annotation, 'name', None):  # Required for at least Pattern
+    elif getattr(annotation, 'name', None) and module in ('typing', 'typing_extensions'):
+        # Required for at least Pattern and Match
         return annotation.name
 
     origin = getattr(annotation, '__origin__', None)
@@ -108,7 +109,7 @@ def format_annotation(annotation, fully_qualified: bool = False) -> str:
 
     try:
         module = get_annotation_module(annotation)
-        class_name = get_annotation_class_name(annotation)
+        class_name = get_annotation_class_name(annotation, module)
         args = get_annotation_args(annotation, module, class_name)
     except ValueError:
         return str(annotation)

tests/test_sphinx_autodoc_typehints.py

@@ -34,7 +34,8 @@ class Inner:
 
 
 class B(Generic[T]):
-    pass
+    # This is set to make sure the correct class name ("B") is picked up
+    name = 'Foo'
 
 
 class C(B[str]):
@@ -90,7 +91,7 @@ class Metaclass(type):
 ])
 def test_parse_annotation(annotation, module, class_name, args):
     assert get_annotation_module(annotation) == module
-    assert get_annotation_class_name(annotation) == class_name
+    assert get_annotation_class_name(annotation, module) == class_name
     assert get_annotation_args(annotation, module, class_name) == args