Added (and fixed) Python 3.10 support

Author: agronholm

.github/workflows/codeqa-test.yml

@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-alpha.5]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

setup.cfg

@@ -22,6 +22,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 py_modules = sphinx_autodoc_typehints

sphinx_autodoc_typehints.py

@@ -87,6 +87,7 @@ def get_annotation_args(annotation, module: str, class_name: str) -> Tuple:
 def format_annotation(annotation,
                       fully_qualified: bool = False,
                       simplify_optional_unions: bool = True) -> str:
+    print(f'formatting annotation: {annotation!r} ({type(annotation)})')
     # Special cases
     if annotation is None or annotation is type(None):  # noqa: E721
         return ':py:obj:`None`'
@@ -105,7 +106,7 @@ def format_annotation(annotation,
         class_name = get_annotation_class_name(annotation, module)
         args = get_annotation_args(annotation, module, class_name)
     except ValueError:
-        return str(annotation)
+        return str(annotation).strip("'")
 
     # Redirect all typing_extensions types to the stdlib typing module
     if module == 'typing_extensions':
@@ -165,6 +166,8 @@ def process_signature(app, what: str, name: str, obj, options, signature, return
         param.replace(annotation=inspect.Parameter.empty)
         for param in signature.parameters.values()
     ]
+    if name == 'dummy_module.function_with_unresolvable_annotation':
+        print(f'  parameters: {parameters}')
 
     # The generated dataclass __init__() and class are weird and need extra checks
     # This helper function operates on the generated class and methods
@@ -186,6 +189,8 @@ def _is_dataclass(name: str, what: str, qualname: str) -> bool:
         return
 
     if parameters:
+        if name == 'dummy_module.function_with_unresolvable_annotation':
+            print('  formatting parameters')
         if inspect.isclass(original_obj) or (what == 'method' and name.endswith('.__init__')):
             del parameters[0]
         elif what == 'method':
@@ -209,6 +214,8 @@ def _is_dataclass(name: str, what: str, qualname: str) -> bool:
         parameters=parameters,
         return_annotation=inspect.Signature.empty)
 
+    if name == 'dummy_module.function_with_unresolvable_annotation':
+        print('  stringifying signature')
     return stringify_signature(signature).replace('\\', '\\\\'), None
 
 

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.3.0
-envlist = py36, py37, py38, py39, flake8
+envlist = py36, py37, py38, py39, py310, flake8
 skip_missing_interpreters = true
 isolated_build = true