gh-148680: Replace internal names with type_reprs of objects in string representations of ForwardRef#148682
Conversation
| resolved_str = type_repr(name_obj) | ||
| else: | ||
| visitor = _ExtraNameFixer(names) | ||
| ast_expr = ast.parse(resolved_str, mode="eval").body |
There was a problem hiding this comment.
We might need to cache this, it's probably pretty slow. What do you think?
There was a problem hiding this comment.
This is in fact, not very fast. Definitely worth caching if it's going to be accessed frequently.
There was a problem hiding this comment.
>>> a_anno
ForwardRef('unknown | str | int | list[str] | tuple[int, ...]', is_class=True, owner=<class '__main__.Example'>)
>>> b_anno
ForwardRef('unknown', is_class=True, owner=<class '__main__.Example'>)
>>> a = timeit(lambda: a_anno.__resolved_forward_str__, number=10_000)
>>> b = timeit(lambda: b_anno.__resolved_forward_str__, number=10_000)
>>> a
0.18359258100008446
>>> b
0.0018204959997092374
>>> a / b
100.8475607907994There was a problem hiding this comment.
I've added a cache and ended up shortening the name of the property and the cache. Adding the cache did mean adding an extra slot to both classes.
Not completely sold on the names I have if you have something better.
Fix a misplaced parenthesis that incorrectly caused a statement to evaluate as truthy Co-authored-by: Shamil <ashm.tech@proton.me>
JelleZijlstra
left a comment
JelleZijlstra
left a comment
There was a problem hiding this comment.
Looks good, but could you add a NEWS entry?
We'll also have to decide whether to backport to 3.14. I'm leaning towards yes, because the old behavior seems genuinely buggy.
|
Thanks @DavidCEllis for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14. |
|
GH-148913 is a backport of this pull request to the 3.14 branch. |
3 participants
This adds a new
ForwardRef.__resolved_forward_str__attribute which takes the__forward_arg__and replaces any internal__annotationlib_name_x__names with thetype_reprof the object they represent.Before:
After:
This approach replaces the extra_names with their
type_reprwhen the forwardref is evaluated to a string. I'm fairly sure that trying to get the original names as they are in the source would be both slower and significantly more complicated.This logic is largely based on something I already have for my
reannotatelibrary.