[python 3.11] Handle upstream changes to Tuple[()]
#273
Conversation
This file contains 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
This has a special case to handle '()', but the test (whether the 'elements' iterable is truthy) no longer works as it always passes. Instead, always do the join, then test if it's truthy or not, and return the failsafe '()' if not. This addresses one test failure in Instagram#272: ``` _______________________ TestRenderAnnotation.test_render_annotation[Tuple-Tuple[()]] _______________________ tests/test_stubs.py:212: in test_render_annotation assert render_annotation(annotation) == expected E AssertionError: assert 'Tuple[]' == 'Tuple[()]' E - Tuple[()] E ? -- E + Tuple[] ``` Appears to be due to python/cpython#91137 Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
In Python 3.11, `get_args(Tuple[()])` returns `()` instead of `((),)`: python/cpython#91137 Change our code to be able to handle this. Address this test failure in ``` _____________________________ TestTypeConversion.test_type_round_trip[Tuple2] ______________________________ tests/test_encoding.py:80: in test_type_round_trip assert type_from_dict(type_to_dict(typ)) == typ E AssertionError: assert typing.Tuple == typing.Tuple[()] E + where typing.Tuple = type_from_dict({'module': 'typing', 'qualname': 'Tuple'}) E + where {'module': 'typing', 'qualname': 'Tuple'} = type_to_dict(typing.Tuple[()]) ``` Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
Needs to update the special case for `Tuple[()]` for Python 3.11's python/cpython#91137 Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
michel-slm
changed the title
Tuple[()]
carljm
suggested changes
Oct 4, 2022
AbeyK
reviewed
Oct 28, 2022
| @@ -357,7 +357,8 @@ def rewrite_type_variable(self, type_variable: Any) -> str: | |||
| ) | |||
|
|
|||
| def make_builtin_tuple(self, elements: Iterable[str]) -> str: | |||
| return ", ".join(elements) if elements else "()" | |||
| res = ", ".join(elements) | |||
There was a problem hiding this comment.
nit: You could do return ", ".join(elements) or "()"
|
Superseded by #279 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upstream changes how
Tuple[()]behaves in python/cpython#91137:__getattr__now returns()instead of((),). Change the code to handle that (but preserving the old code path for Python <= 3.10).Fixes #272.
Signed-off-by: Michel Alexandre Salim michel@michel-slm.name