gh-137969: Fix evaluation of ref.evaluate(format=Format.FORWARDREF) objects
#138075
Conversation
|
All commit authors signed the Contributor License Agreement. |
|
Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool. If this change has little impact on Python users, wait for a maintainer to apply the |
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.
dr-carlos
force-pushed
the
forwardref-double-anno
branch
from
17bd38f to
1f23c41
Compare
Just added tests that re-evaluation works for new locals and globals, and that it still correctly raises a NameError. |
| import typing | ||
| import unittest | ||
| from annotationlib import ( |
There was a problem hiding this comment.
No need to resort the imports
| except Exception: | ||
| if not is_forwardref_format: | ||
| raise | ||
| new_locals = _StringifierDict( | ||
| {**builtins.__dict__, **locals}, |
There was a problem hiding this comment.
Unrelated to this PR but putting the builtins here seems wrong, wouldn't this give the builtins preference over the globals? We can sort that out in another PR though.
| @@ -1683,6 +1678,28 @@ def test_fwdref_invalid_syntax(self): | |||
| with self.assertRaises(SyntaxError): | |||
| fr.evaluate() | |||
|
|
|||
| def test_re_evaluate(self): | |||
There was a problem hiding this comment.
This test also passes for me on main without your changes.
This fix seemingly preserves type parameter semantics for simple tests - unsure if there is more complex behaviour that it may break.
ref.evaluate(format=Format.FORWARDREF)returns a ForwardRef with a copied__globals__that no longer updates #137969