Fixed decorator classes not being processed as classes

Fixes #111.

Author: agronholm

CHANGELOG.rst

@@ -3,6 +3,7 @@ UNRELEASED
 
 * Rewrote the annotation formatting logic (fixes Python 3.5.2 compatibility regressions and an
   ``AttributeError`` regression introduced in v1.9.0)
+* Fixed decorator classes not being processed as classes
 
 
 1.9.0

sphinx_autodoc_typehints.py

@@ -147,7 +147,8 @@ def process_signature(app, what: str, name: str, obj, options, signature, return
     if not callable(obj):
         return
 
-    if what in ('class', 'exception'):
+    original_obj = obj
+    if inspect.isclass(obj):
         obj = getattr(obj, '__init__', getattr(obj, '__new__', None))
 
     if not getattr(obj, '__annotations__', None):
@@ -167,7 +168,7 @@ def process_signature(app, what: str, name: str, obj, options, signature, return
         return
 
     if parameters:
-        if what in ('class', 'exception'):
+        if inspect.isclass(original_obj):
             del parameters[0]
         elif what == 'method':
             outer = inspect.getmodule(obj)
@@ -346,11 +347,12 @@ def add(val):
 
 
 def process_docstring(app, what, name, obj, options, lines):
+    original_obj = obj
     if isinstance(obj, property):
         obj = obj.fget
 
     if callable(obj):
-        if what in ('class', 'exception'):
+        if inspect.isclass(obj):
             obj = getattr(obj, '__init__')
 
         obj = inspect.unwrap(obj)
@@ -383,7 +385,7 @@ def process_docstring(app, what, name, obj, options, lines):
                     ':type {}: {}'.format(argname, formatted_annotation)
                 )
 
-        if 'return' in type_hints and what not in ('class', 'exception'):
+        if 'return' in type_hints and not inspect.isclass(original_obj):
             formatted_annotation = format_annotation(
                 type_hints['return'], fully_qualified=app.config.typehints_fully_qualified)
 

tests/roots/test-dummy/dummy_module.py

@@ -237,3 +237,14 @@ def undocumented_function(x: int) -> str:
 @dataclass
 class DataClass:
     """Class docstring."""
+
+
+class Decorator:
+    """
+    Initializer docstring.
+
+    :param func: function
+    """
+
+    def __init__(self, func: Callable[[int, str], str]):
+        pass

tests/roots/test-dummy/index.rst

@@ -32,3 +32,5 @@ Dummy Module
 .. autoclass:: dummy_module.DataClass
     :undoc-members:
     :special-members: __init__
+
+.. autodecorator:: dummy_module.Decorator

tests/test_sphinx_autodoc_typehints.py

@@ -215,14 +215,17 @@ def test_sphinx_output(app, status, warning, always_document_param_types):
     warnings = warning.getvalue().strip()
     assert 'Cannot resolve forward reference in type annotations of ' in warnings, warnings
 
+    format_args = {}
     if always_document_param_types:
-        undoc_params = '''
-
-           Parameters:
-              **x** ("int") --'''
+        format_args['undoc_params'] = '\n\n   Parameters:\n      **x** ("int") --'
+    else:
+        format_args['undoc_params'] = ""
 
+    if sys.version_info < (3, 6):
+        format_args['dataclass_docstring'] = ('Initialize self.  See help(type(self)) for '
+                                              'accurate signature.')
     else:
-        undoc_params = ""
+        format_args['dataclass_docstring'] = 'Return type:\n         "None"'
 
     text_path = pathlib.Path(app.srcdir) / '_build' / 'text' / 'index.txt'
     with text_path.open('r') as f:
@@ -475,16 +478,15 @@ class dummy_module.DataClass
            Class docstring.
 
            __init__()
-        '''.format(undoc_params=undoc_params)).replace('–', '--')
-
-        if sys.version_info < (3, 6):
-            expected_contents += '''
-      Initialize self.  See help(type(self)) for accurate signature.
-'''
-        else:
-            expected_contents += '''
-      Return type:
-         "None"
-'''
 
+              {dataclass_docstring}
+
+        @dummy_module.Decorator(func)
+
+           Initializer docstring.
+
+           Parameters:
+              **func** ("Callable"[["int", "str"], "str"]) -- function
+        ''')
+        expected_contents = expected_contents.format(**format_args).replace('–', '--')
         assert text_contents == expected_contents