FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-146556: Fix infinite loop in annotationlib.get_annotations() on circular __wrapped__ by raminfp · Pull Request #146557 · python/cpython · GitHub

/ cpython Public
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
17 changes: 15 additions & 2 deletions Lib/annotationlib.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1037,13 +1037,26 @@ def get_annotations(
obj_globals = obj_locals = unwrap = None

if unwrap is not None:
# Use an id-based visited set to detect cycles in the __wrapped__
# and functools.partial.func chain (e.g. f.__wrapped__ = f).
# On cycle detection we stop and use whatever __globals__ we have
# found so far, mirroring the approach of inspect.unwrap().
_seen_ids = {id(unwrap)}
while True:
if hasattr(unwrap, "__wrapped__"):
unwrap = unwrap.__wrapped__
candidate = unwrap.__wrapped__
if id(candidate) in _seen_ids:
break
_seen_ids.add(id(candidate))
unwrap = candidate
continue
if functools := sys.modules.get("functools"):
if isinstance(unwrap, functools.partial):
unwrap = unwrap.func
candidate = unwrap.func
if id(candidate) in _seen_ids:
break
_seen_ids.add(id(candidate))
unwrap = candidate
continue
break
if hasattr(unwrap, "__globals__"):
Expand Down
25 changes: 25 additions & 0 deletions Lib/test/test_annotationlib.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,31 @@ def foo():
get_annotations(foo, format=Format.FORWARDREF, eval_str=True)
get_annotations(foo, format=Format.STRING, eval_str=True)

def test_eval_str_wrapped_cycle_self(self):
# gh-146556: self-referential __wrapped__ cycle must not hang.
def f(x: 'int') -> 'str': ...
f.__wrapped__ = f
# Cycle is detected and broken; globals from f itself are used.
result = get_annotations(f, eval_str=True)
self.assertEqual(result, {'x': int, 'return': str})

def test_eval_str_wrapped_cycle_mutual(self):
# gh-146556: mutual __wrapped__ cycle (a -> b -> a) must not hang.
def a(x: 'int'): ...
def b(): ...
a.__wrapped__ = b
b.__wrapped__ = a
result = get_annotations(a, eval_str=True)
self.assertEqual(result, {'x': int})

def test_eval_str_wrapped_chain_no_cycle(self):
# gh-146556: a valid (non-cyclic) __wrapped__ chain must still work.
def inner(x: 'int'): ...
def outer(x: 'int'): ...
outer.__wrapped__ = inner
result = get_annotations(outer, eval_str=True)
self.assertEqual(result, {'x': int})

def test_stock_annotations(self):
def foo(a: int, b: str):
pass
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Fix :func:`annotationlib.get_annotations` hanging indefinitely when called
with ``eval_str=True`` on a callable that has a circular ``__wrapped__``
chain (e.g. ``f.__wrapped__ = f``). Cycle detection using an id-based
visited set now stops the traversal and falls back to the globals found
so far, mirroring the approach of :func:`inspect.unwrap`.
Loading

Back | FazBrowse Home | New Git URL