diff --git a/utils/incrparse/test_util.py b/utils/incrparse/test_util.py index 654887b12efde..fce7532251193 100755 --- a/utils/incrparse/test_util.py +++ b/utils/incrparse/test_util.py @@ -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: