summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2016-01-12 17:46:26 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2016-02-08 14:48:14 -0800
commit525e663c248d35b52c7c2622c6848d4122b4f0f5 (patch)
treeccbfa03f5e911a0959e34091dee70931d0c9a97e /framework
parentfd851b49794b1ee14923f401374ff0534f94d464 (diff)
framework/core.py: make collect_system_info return unicode
This changes collect_system_info to convert the raw output of each command to unicode before returning it. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/core.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/core.py b/framework/core.py
index 5ef72cb65..3906b58cb 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -154,8 +154,8 @@ def collect_system_info():
for name, command in progs:
try:
- result[name] = subprocess.check_output(command,
- stderr=subprocess.STDOUT)
+ out = subprocess.check_output(command, stderr=subprocess.STDOUT)
+ result[name] = out.decode('utf-8')
except OSError as e:
# If we get the 'no file or directory' error then pass, that means
# that the binary isn't installed or isn't relavent to the system.