Fix unicode argument processing for py2 #679
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
In python2, sys.argv is a bytestring of whatever encoding is used by the terminal. In python3, sys.argv is a list of unicode strings. This causes problems because the rest of the code assumes unicode. The fix is to automatically decode to unicode based on sys.stdin as soon as we parse the args. This was originally reported in aws#593, and boto/botocore#218. I'll need to more investigation to see if this problem applies to JSON files via file://, this commit only fixes the case where unicode is specified on the command line.
This happens in our unittest.
| @@ -43,6 +45,19 @@ def _check_value(self, action, value): | |||
| msg.extend(extra) | |||
| raise argparse.ArgumentError(action, '\n'.join(msg)) | |||
|
|
|||
| def parse_known_args(self, args, namespace=None): | |||
| parsed, remaining = super(CLIArgParser, self).parse_known_args(args, namespace) | |||
| terminal_encoding = getattr(sys.stdin, 'encoding', 'utf-8') | |||
There was a problem hiding this comment.
Do you really want a default value of utf-8 here? I guess I'm not sure what it would mean for sys.stdin not to have an encoding attribute.
There was a problem hiding this comment.
I've only encountered it when something patches out sys.stdin, and is file-like enough to work, but is missing attributes such as encoding. For example, our test runner will do something like:
original = sys.stdin
sys.stdin = cStringIO.StringIO()
try:
...
finally:
sys.stdin = original
|
Otherwise, LGTM FWIW |
|
LGTM. |
thoward-godaddy
pushed a commit
to thoward-godaddy/aws-cli
that referenced
this pull request
Feb 12, 2022
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.
In python2, sys.argv is a bytestring of whatever encoding
is used by the terminal. In python3, sys.argv is a list of unicode
strings. This causes problems because the rest of the code assumes
unicode.
The fix is to automatically decode to unicode based on sys.stdin
as soon as we parse the args.
This was originally reported in #593, and
boto/botocore#218.
I'll need to more investigation to see if this problem applies
to JSON files via file://, this commit only fixes the case where
unicode is specified on the command line.
Before:
After: