Skip to content

gh-125618: Make FORWARDREF format succeed more often #132818

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 11 commits into from
May 4, 2025
Merged

gh-125618: Make FORWARDREF format succeed more often #132818

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15ea954
gh-125618: Make FORWARDREF format succeed more often
JelleZijlstra Apr 22, 2025
8b776d0
one line
JelleZijlstra Apr 22, 2025
fb5354d
Merge remote-tracking branch 'upstream/main' into fwdref-format
JelleZijlstra Apr 23, 2025
d095e2c
fix
JelleZijlstra Apr 23, 2025
d27ffd8
add test
JelleZijlstra Apr 23, 2025
bf260fb
fix test
JelleZijlstra Apr 23, 2025
28be691
formatting
JelleZijlstra Apr 23, 2025
675f55c
:Merge remote-tracking branch 'upstream/main' into fwdref-format
JelleZijlstra Apr 23, 2025
f1d8888
Merge remote-tracking branch 'upstream/main' into fwdref-format
JelleZijlstra Apr 25, 2025
ec613f8
Merge remote-tracking branch 'upstream/main' into fwdref-format
JelleZijlstra May 4, 2025
9684e40
fix merge
JelleZijlstra May 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
formatting
  • Loading branch information
@JelleZijlstra
JelleZijlstra committed Apr 23, 2025
commit 28be691c03e303ce6c1e09a0bda7f75f587c5695
22 changes: 15 additions & 7 deletions Lib/annotationlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,15 @@ def __init__(
def __init_subclass__(cls, /, *args, **kwds):
raise TypeError("Cannot subclass ForwardRef")

def evaluate(self, *, globals=None, locals=None, type_params=None, owner=None,
format=Format.VALUE):
def evaluate(
self,
*,
globals=None,
locals=None,
type_params=None,
owner=None,
format=Format.VALUE,
):
"""Evaluate the forward reference and return the value.

If the forward reference cannot be evaluated, raise an exception.
Expand Down Expand Up @@ -182,8 +189,10 @@ def evaluate(self, *, globals=None, locals=None, type_params=None, owner=None,
if not is_forwardref_format:
raise
new_locals = _StringifierDict(
{**builtins.__dict__, **locals}, globals=globals, owner=owner,
is_class=self.__forward_is_class__
{**builtins.__dict__, **locals},
globals=globals,
owner=owner,
is_class=self.__forward_is_class__,
)
try:
result = eval(code, globals=globals, locals=new_locals)
Expand Down Expand Up @@ -650,8 +659,7 @@ def call_annotate_function(annotate, format, *, owner=None, _is_evaluate=False):
raise ValueError(f"Invalid format: {format!r}")


def _build_closure(annotate, owner, is_class, stringifier_dict, *,
allow_evaluation):
def _build_closure(annotate, owner, is_class, stringifier_dict, *, allow_evaluation):
if not annotate.__closure__:
return None
freevars = annotate.__code__.co_freevars
Expand Down Expand Up @@ -789,7 +797,7 @@ def get_annotations(
# But if we didn't get it, we use __annotations__ instead.
ann = _get_dunder_annotations(obj)
if ann is not None:
return annotations_to_string(ann)
return annotations_to_string(ann)
case Format.VALUE_WITH_FAKE_GLOBALS:
raise ValueError("The VALUE_WITH_FAKE_GLOBALS format is for internal use only")
case _:
Expand Down
2 changes: 0 additions & 2 deletions Lib/test/test_annotationlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,8 +1086,6 @@ def test_pep_695_generics_with_future_annotations_nested_in_function(self):
set(results.generic_func.__type_params__),
)

maxDiff = None

def test_partial_evaluation(self):
def f(
x: builtins.undef,
Expand Down