Merge charm-hw-health:str-bytes-conversion into charm-hw-health:stable/20.05

[Andrea Ieri]

[cron_ipmi_sensors.py] decode subprocess bytes output into str

Closes-Bug: 1879603

[Zachary Zehring (zzehring)]

Approved.

review: Approve

[Paul Goins (vultaire)]

LGTM, although bytes.decode('utf8') can simply be bytes.decode() as well; utf8 is the default.

review: Approve

[Paul Goins (vultaire)]

Actually, this was already merged into stable/20.05 previously as part of fixing lp#1882978. I unfortunately forgot to push the updates. I just pushed now; I'll mark this as resolved.

Unmerged commits

8c01c0d... by Joe Guo on 2020-05-20

cron_ipmi_sensors.py: rm encoding header

should defaults to utf-8.

Signed-off-by: Joe Guo <email address hidden>

56169b4... by Joe Guo on 2020-05-20

cron_ipmi_sensors.py: subprocess.check_output decode

`subprocess.check_output` always return bytes, even in python3.
decode output to str for python3.

Signed-off-by: Joe Guo <email address hidden>

diff --git a/src/files/ipmi/cron_ipmi_sensors.py b/src/files/ipmi/cron_ipmi_sensors.py
index a11f9fb..8ce5ee6 100644
--- a/src/files/ipmi/cron_ipmi_sensors.py
+++ b/src/files/ipmi/cron_ipmi_sensors.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: us-ascii -*-
 
 import os
 import subprocess
@@ -40,7 +39,7 @@ def gather_metrics():
     if len(sys.argv) > 1:
         cmdline.extend(sys.argv[1:])
     try:
-        output = subprocess.check_output(cmdline)
+        output = subprocess.check_output(cmdline).decode('utf8')
     except subprocess.CalledProcessError as error:
         output = error.stdout.decode(errors='ignore')
         with open(TMP_OUTPUT_FILE, 'w') as fd: