Merge charm-hw-health:str-bytes-conversion into charm-hw-health:master

Proposed by Joe Guo
Status: Merged
Approved by: Alvaro Uria
Approved revision: 8c01c0d81663907f727f68500eef405175a4cf5a
Merged at revision: 9896fd49ff93b074427065058414159bb8ee3ed2
Proposed branch: charm-hw-health:str-bytes-conversion
Merge into: charm-hw-health:master
Diff against target: 19 lines (+1/-2)
1 file modified
src/files/ipmi/cron_ipmi_sensors.py (+1/-2)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Xav Paice (community) Approve
Review via email: mp+384228@code.launchpad.net

Commit message

1. decode output from subprocess.check_output to unicode str for python3.
2. rm script encoding header(us-ascii) so it defaults to utf-8.

LP: #1879603

To post a comment you must log in.
Revision history for this message
Xav Paice (xavpaice) wrote :

LGTM

review: Approve
Revision history for this message
Alvaro Uria (aluria) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/files/ipmi/cron_ipmi_sensors.py b/src/files/ipmi/cron_ipmi_sensors.py
2index a11f9fb..8ce5ee6 100644
3--- a/src/files/ipmi/cron_ipmi_sensors.py
4+++ b/src/files/ipmi/cron_ipmi_sensors.py
5@@ -1,5 +1,4 @@
6 #!/usr/bin/env python3
7-# -*- coding: us-ascii -*-
8
9 import os
10 import subprocess
11@@ -40,7 +39,7 @@ def gather_metrics():
12 if len(sys.argv) > 1:
13 cmdline.extend(sys.argv[1:])
14 try:
15- output = subprocess.check_output(cmdline)
16+ output = subprocess.check_output(cmdline).decode('utf8')
17 except subprocess.CalledProcessError as error:
18 output = error.stdout.decode(errors='ignore')
19 with open(TMP_OUTPUT_FILE, 'w') as fd:

Subscribers

No one subscribed via source and target branches