Skip to content

[5.7.0][incrParse] Encode Unicode characters in command output if stdout doesn't support Unicode #60676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2022
Merged

[5.7.0][incrParse] Encode Unicode characters in command output if stdout doesn't support Unicode #60676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion utils/incrparse/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ def escapeCmdArg(arg):
def run_command(cmd):
if sys.version_info[0] < 3:
cmd = list(map(lambda s: s.encode('utf-8'), cmd))
print(' '.join([escapeCmdArg(arg) for arg in cmd]))
cmdStr = ' '.join([escapeCmdArg(arg) for arg in cmd])
if not sys.stdout.encoding.lower().startswith('utf'):
# stdout doesn't support Unicode characters, encode them into an escape
# sequence
cmdStr = cmdStr.encode('utf-8')
print(cmdStr)
if sys.version_info[0] < 3 or platform.system() == 'Windows':
return subprocess.check_output(cmd, stderr=subprocess.STDOUT)
else:
Expand Down