Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Lib/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -2347,8 +2347,15 @@ def _signature_from_function(cls, func, skip_bound_arg=True,
positional = arg_names[:pos_count]
keyword_only_count = func_code.co_kwonlyargcount
keyword_only = arg_names[pos_count:pos_count + keyword_only_count]
annotations = get_annotations(func, globals=globals, locals=locals, eval_str=eval_str,
format=annotation_format)
try:
annotations = get_annotations(func, globals=globals, locals=locals, eval_str=eval_str,
format=annotation_format)
except (NameError, AttributeError, ImportError):
if annotation_format == Format.VALUE:
annotations = get_annotations(func, globals=globals, locals=locals, eval_str=False,
format=Format.FORWARDREF)
else:
raise
defaults = func.__defaults__
kwdefaults = func.__kwdefaults__

Expand Down
30 changes: 23 additions & 7 deletions Lib/test/test_inspect/test_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -1392,12 +1392,12 @@ def test_getfullargspec(self):
kwonlyargs_e=['e', 'f'],
kwonlydefaults_e={'e': 4, 'f': 5})

def get_getfullargspec_with_undefined_names_in_annotations(self):
def test_getfullargspec_with_undefined_names_in_annotations(self):
def my_func(a: undefined_name):
pass

with self.assertRaises(NameError):
inspect.getfullargspec(my_func)
arg_spec = inspect.getfullargspec(my_func)
self.assertIsInstance(arg_spec.annotations['a'], ForwardRef)

self.assertFullArgSpecEquals(my_func, ['a'], ann_e={'a': 'undefined_name'},
annotation_format=Format.STRING)
Expand Down Expand Up @@ -3107,6 +3107,18 @@ def signature(func, **kw):
(... if sig.return_annotation is sig.empty
else sig.return_annotation))

def test_signature_on_type_checking_only_annotations(self):
# Issue #152835: inspect.signature should fall back to FORWARDREF format
# when annotations fail to evaluate due to NameError/AttributeError/ImportError.
def f(arg: UndefinedName, arg2: sys.NonExistentAttribute):
pass

sig = inspect.signature(f)
self.assertIsInstance(sig.parameters['arg'].annotation, ForwardRef)
self.assertEqual(sig.parameters['arg'].annotation.__forward_arg__, 'UndefinedName')
self.assertIsInstance(sig.parameters['arg2'].annotation, ForwardRef)
self.assertEqual(sig.parameters['arg2'].annotation.__forward_arg__, 'sys.NonExistentAttribute')

def test_signature_object(self):
S = inspect.Signature
P = inspect.Parameter
Expand Down Expand Up @@ -5389,10 +5401,14 @@ def test_signature_annotation_format(self):
signature_func(ida.f, annotation_format=Format.FORWARDREF),
sig([par("x", PORK, annotation=EqualToForwardRef("undefined", owner=ida.f))])
)
with self.assertRaisesRegex(NameError, "undefined"):
signature_func(ida.f, annotation_format=Format.VALUE)
with self.assertRaisesRegex(NameError, "undefined"):
signature_func(ida.f)
self.assertEqual(
signature_func(ida.f, annotation_format=Format.VALUE),
sig([par("x", PORK, annotation=EqualToForwardRef("undefined", owner=ida.f))])
)
self.assertEqual(
signature_func(ida.f),
sig([par("x", PORK, annotation=EqualToForwardRef("undefined", owner=ida.f))])
)

def test_signature_deferred_annotations(self):
def f(x: undef):
Expand Down
Loading