bpo-39990: try resolving type hints in pydoc

Signed-off-by: Filipe Laíns <[email protected]>

Author: FFY00

Lib/pydoc.py

@@ -907,9 +907,12 @@ def spilldata(msg, attrs, predicate):
 
         decl = ''
         try:
-            signature = inspect.signature(object)
-        except (ValueError, TypeError):
-            signature = None
+            signature = inspect.signature(object, resolve_type_hints=True)
+        except (NameError, AttributeError, SyntaxError, TypeError, ValueError):
+            try:
+                signature = inspect.signature(object, resolve_type_hints=False)
+            except (ValueError, TypeError):
+                signature = None
         if signature:
             argspec = str(signature)
             if argspec and argspec != '()':
@@ -967,9 +970,12 @@ def docroutine(self, object, name=None, mod=None,
         argspec = None
         if inspect.isroutine(object):
             try:
-                signature = inspect.signature(object)
-            except (ValueError, TypeError):
-                signature = None
+                signature = inspect.signature(object, resolve_type_hints=True)
+            except (NameError, AttributeError, SyntaxError, TypeError, ValueError):
+                try:
+                    signature = inspect.signature(object, resolve_type_hints=False)
+                except (ValueError, TypeError):
+                    signature = None
             if signature:
                 argspec = str(signature)
                 if realname == '<lambda>':
@@ -1226,9 +1232,12 @@ def makename(c, m=object.__module__):
         push = contents.append
 
         try:
-            signature = inspect.signature(object)
-        except (ValueError, TypeError):
-            signature = None
+            signature = inspect.signature(object, resolve_type_hints=True)
+        except (NameError, AttributeError, SyntaxError, TypeError, ValueError):
+            try:
+                signature = inspect.signature(object, resolve_type_hints=False)
+            except (ValueError, TypeError):
+                signature = None
         if signature:
             argspec = str(signature)
             if argspec and argspec != '()':
@@ -1397,9 +1406,12 @@ def docroutine(self, object, name=None, mod=None, cl=None):
 
         if inspect.isroutine(object):
             try:
-                signature = inspect.signature(object)
-            except (ValueError, TypeError):
-                signature = None
+                signature = inspect.signature(object, resolve_type_hints=True)
+            except (NameError, AttributeError, SyntaxError, TypeError, ValueError):
+                try:
+                    signature = inspect.signature(object, resolve_type_hints=False)
+                except (ValueError, TypeError):
+                    signature = None
             if signature:
                 argspec = str(signature)
                 if realname == '<lambda>':