Added missing decode.

这个提交包含在:
Craig Warren
2016-08-03 14:57:09 +01:00
父节点 c2ba4f8426
当前提交 d4bf1920ea

查看文件

@@ -162,7 +162,7 @@ def get_machine_cpu_os():
manufacturer = subprocess.check_output("more /sys/class/dmi/id/sys_vendor", shell=True).decode('utf-8').strip() manufacturer = subprocess.check_output("more /sys/class/dmi/id/sys_vendor", shell=True).decode('utf-8').strip()
model = subprocess.check_output("more /sys/class/dmi/id/product_name", shell=True).decode('utf-8').strip() model = subprocess.check_output("more /sys/class/dmi/id/product_name", shell=True).decode('utf-8').strip()
machineID = manufacturer + ' ' + model machineID = manufacturer + ' ' + model
allcpuinfo = subprocess.check_output("cat /proc/cpuinfo", shell=True).strip() allcpuinfo = subprocess.check_output("cat /proc/cpuinfo", shell=True).decode('utf-8').strip()
for line in allcpuinfo.split('\n'): for line in allcpuinfo.split('\n'):
if 'model name' in line: if 'model name' in line:
cpuID = re.sub( '.*model name.*:', '', line, 1) cpuID = re.sub( '.*model name.*:', '', line, 1)