epicknex/hererocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make subprocess output decoding more resilient

Browse Source 
Use platform default encoding, ignore decoding errors.
This commit is contained in:
Peter Melnichenko 2017-05-02 22:07:45 +03:00
parent 265b77f365
commit 870b84d673
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hererocks.py
View File

@ -8,6 +8,7 @@ import argparse
import hashlib import hashlib
import inspect import inspect
import json import json
import locale
import os import os
import platform import platform
import re import re
@ -232,6 +233,8 @@ def download(url, filename):
with open(filename, "wb") as out: with open(filename, "wb") as out:
out.write(data) out.write(data)
default_encoding = locale.getpreferredencoding()
def run(*args, **kwargs): def run(*args, **kwargs):
"""Execute a command. """Execute a command.
@ -260,7 +263,7 @@ def run(*args, **kwargs):
return "" return ""
if not live_output: if not live_output:
sys.stdout.write(exception.output.decode("UTF-8")) sys.stdout.write(exception.output.decode(default_encoding, "ignore"))
sys.exit("Error: got exitcode {} from command {}".format( sys.exit("Error: got exitcode {} from command {}".format(
exception.returncode, " ".join(args))) exception.returncode, " ".join(args)))
@ -268,9 +271,9 @@ def run(*args, **kwargs):
sys.exit("Error: couldn't run {}: is {} in PATH?".format(" ".join(args), args[0])) sys.exit("Error: couldn't run {}: is {} in PATH?".format(" ".join(args), args[0]))
if opts.verbose and capture: if opts.verbose and capture:
sys.stdout.write(output.decode("UTF-8")) sys.stdout.write(output.decode(default_encoding, "ignore"))
return capture and output.decode("UTF-8").strip() return capture and output.decode(default_encoding, "ignore").strip()
def get_output(*args): def get_output(*args):
return run(get_output=True, *args) return run(get_output=True, *args)