Allow unicode and bytes in EnumTypeWrapper.Value #5743
Merged
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
Intended to do this in python#5004, but missed for python2
|
I think the two failing checks are not related to my change? I read through them and the appeared not related. |
|
I fixed the stubtest issue in #5742 too. If you want you can copy over the fix from that PR. |
JelleZijlstra
approved these changes
Jul 9, 2021
srittau
reviewed
Jul 9, 2021
| @@ -10,7 +10,7 @@ class _EnumTypeWrapper(Generic[_V]): | |||
| DESCRIPTOR: EnumDescriptor | |||
| def __init__(self, enum_type: EnumDescriptor) -> None: ... | |||
| def Name(self, number: _V) -> str: ... | |||
| def Value(self, name: Union[str, bytes]) -> _V: ... | |||
| def Value(self, name: Union[Text, bytes]) -> _V: ... | |||
There was a problem hiding this comment.
Nit (not a blocker): We now prefer PEP 604 syntax:
Suggested change
| def Value(self, name: Union[Text, bytes]) -> _V: ... | |
| def Value(self, name: Text | bytes) -> _V: ... |
There was a problem hiding this comment.
I decided to apply this before merge, because why not.
Co-authored-by: Sebastian Rittau <srittau@rittau.biz>
Akuli
reviewed
Jul 9, 2021
| @@ -1,4 +1,4 @@ | |||
| from typing import Generic, List, Tuple, TypeVar, Union | |||
| from typing import Generic, List, Text, Tuple, TypeVar, Union | |||
There was a problem hiding this comment.
And now we need to change the import too:
Suggested change
| from typing import Generic, List, Text, Tuple, TypeVar, Union | |
| from typing import Generic, List, Text, Tuple, TypeVar |
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.
Intended to do this in #5004, but missed for python2