Skip to content

gh-138425: Correctly partially evaluate global generics with undefined params in ref.evaluate(format=Format.FORWARDREF) #138430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JelleZijlstra merged 8 commits into from
Nov 2, 2025
Merged

gh-138425: Correctly partially evaluate global generics with undefined params in ref.evaluate(format=Format.FORWARDREF) #138430

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2164613
Consider globals in `ref.evaluate()` for undefined generic `ForwardRef`s
dr-carlos Sep 3, 2025
438aea3
Test `ref.evaluate()` on undefined generics
dr-carlos Sep 3, 2025
fd29f95
Check that generic is not a ForwardRef before accessing its attrs
dr-carlos Sep 3, 2025
aab7f3a
Add NEWS entry
dr-carlos Sep 3, 2025
b38e7a6
Update NEWS Entry
dr-carlos Sep 3, 2025
ff4da9a
Use `get_annotations()` to access annotations, check all args in unde…
dr-carlos Sep 4, 2025
f9d892b
Update NEWS entry to more broadly reflect change
dr-carlos Sep 4, 2025
c55640d
Fix typo in NEWS entry
dr-carlos Sep 4, 2025
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
Prev Previous commit
Next Next commit
Check that generic is not a ForwardRef before accessing its attrs
  • Loading branch information
@dr-carlos
dr-carlos committed Sep 3, 2025
commit fd29f95783c7437024671e70eff3f2c387dc3228
21 changes: 12 additions & 9 deletions Lib/test/test_annotationlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,18 +1677,21 @@ def test_name_lookup_without_eval(self):

def test_evaluate_undefined_generic(self):
# Test the codepath where have to eval() with undefined variables.
Comment thread
dr-carlos marked this conversation as resolved.
fwdref = ForwardRef("glob[int, undef]").evaluate(format=Format.FORWARDREF, globals={"glob": dict})
self.assertIs(fwdref.__origin__, dict)
self.assertIs(fwdref.__args__[0], int)
generic = ForwardRef("glob[int, undef]").evaluate(format=Format.FORWARDREF, globals={"glob": dict})
self.assertNotIsInstance(generic, ForwardRef)
self.assertIs(generic.__origin__, dict)
self.assertIs(generic.__args__[0], int)

fwdref = ForwardRef("loc[int, undef]").evaluate(format=Format.FORWARDREF, locals={"loc": dict})
self.assertIs(fwdref.__origin__, dict)
self.assertIs(fwdref.__args__[0], int)
generic = ForwardRef("loc[int, undef]").evaluate(format=Format.FORWARDREF, locals={"loc": dict})
self.assertNotIsInstance(generic, ForwardRef)
self.assertIs(generic.__origin__, dict)
self.assertIs(generic.__args__[0], int)

# Ensure that globals overwrite builtins
fwdref = ForwardRef("list[int, undef]").evaluate(format=Format.FORWARDREF, globals={"list": dict})
self.assertIs(fwdref.__origin__, dict)
self.assertIs(fwdref.__args__[0], int)
generic = ForwardRef("list[int, undef]").evaluate(format=Format.FORWARDREF, globals={"list": dict})
self.assertNotIsInstance(generic, ForwardRef)
self.assertIs(generic.__origin__, dict)
self.assertIs(generic.__args__[0], int)
Comment thread
dr-carlos marked this conversation as resolved.

def test_fwdref_invalid_syntax(self):
fr = ForwardRef("if")
Expand Down