Support calling eval and ast module with unicode in Python 2 #1440
Conversation
This file contains hidden or 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
JelleZijlstra
requested changes
Jun 27, 2017
stdlib/2/__builtin__.pyi
Outdated
| @@ -939,10 +939,10 @@ class UnicodeWarning(Warning): ... | |||
| class BytesWarning(Warning): ... | |||
| class ResourceWarning(Warning): ... | |||
|
|
|||
| def eval(s: str, globals: Dict[str, Any] = ..., locals: Dict[str, Any] = ...) -> Any: ... | |||
| def eval(s: Union[str, unicode], globals: Dict[Union[str, unicode], Any] = ..., locals: Dict[Union[str, unicode], Any] = ...) -> Any: ... | |||
There was a problem hiding this comment.
I believe the dict ones will cause trouble because Dict is invariant in its key type, so now mypy will only let you pass a dictionary whose keys are Union[str, unicode]. Mapping is not correct here either, because eval and exec will modify these dictionaries.
stdlib/2/ast.pyi
Outdated
| @@ -21,7 +21,7 @@ __version__ = ... # type: str | |||
| PyCF_ONLY_AST = ... # type: int | |||
|
|
|||
|
|
|||
| def parse(source: Union[str, bytes], filename: Union[str, bytes] = ..., mode: str = ...) -> Module: ... | |||
| def parse(source: Union[str, unicode, bytes], filename: Union[str, unicode, bytes] = ..., mode: Union[str, unicode] = ...) -> Module: ... | |||
There was a problem hiding this comment.
Union[str, bytes] is redundant in Python 2.
|
@JelleZijlstra addressed the comments, thanks! |
JelleZijlstra
approved these changes
Jun 27, 2017
|
Thanks! |
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.
No description provided.