[PATCH] [LIT] Decode string result in lit.util.capture
Eric Fiselier
eric at efcs.ca
Mon Jan 12 12:10:48 PST 2015
REPOSITORY
rL LLVM
http://reviews.llvm.org/D6769
Files:
llvm/trunk/utils/lit/lit/util.py
Index: llvm/trunk/utils/lit/lit/util.py
===================================================================
--- llvm/trunk/utils/lit/lit/util.py
+++ llvm/trunk/utils/lit/lit/util.py
@@ -16,6 +16,12 @@
return bytes
return to_bytes(bytes)
+def convert_string(bytes):
+ try:
+ return to_string(bytes.decode('utf-8'))
+ except UnicodeError:
+ return str(bytes)
+
def detectCPUs():
"""
Detects the number of CPUs on a system. Cribbed from pp.
@@ -60,7 +66,7 @@
p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
env=env)
out,_ = p.communicate()
- return out
+ return convert_string(out)
def which(command, paths = None):
"""which(command, [paths]) - Look up the given command in the paths string
@@ -166,14 +172,8 @@
raise KeyboardInterrupt
# Ensure the resulting output is always of string type.
- try:
- out = to_string(out.decode('utf-8'))
- except:
- out = str(out)
- try:
- err = to_string(err.decode('utf-8'))
- except:
- err = str(err)
+ out = convert_string(out)
+ err = convert_string(err)
return out, err, exitCode
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D6769.18034.patch
Type: text/x-patch
Size: 1212 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150112/5730f74c/attachment.bin>
More information about the llvm-commits
mailing list