Handle non-ascii commands in Python 2 in make_subprocess_output_error() #6671
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
cjerdonek
added
C: encoding
cjerdonek
force-pushed
the
make-subprocess-error-non-ascii-cmd
branch
9 times, most recently
from
3c564a6
to
d858457
Compare
cjerdonek
force-pushed
the
make-subprocess-error-non-ascii-cmd
branch
from
d858457
to
a6020e8
Compare
xavfernandez
approved these changes
Jul 4, 2019
|
Thanks, @xavfernandez. |
lock
bot
added
the
auto-locked
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is a follow-up to PR #6655 to fix a potential Python 2
strissue if the formatted command contains non-ascii characters. We want to be sure we don't trigger an error inmake_subprocess_output_error()when callingstr.format()if the commandstrcontains non-ascii characters.The PR does this by exposing a slightly more general variant of the
console_to_str()function we callstr_to_display(). It can be used to convert any byte string to text for logging purposes and not just bytes coming from a subprocess stdout (which is whatconsole_to_str()was previously added for).