Merge lp:~gocept/landscape-client/py3-sysstats into lp:~landscape/landscape-client/trunk

[Steffen Allner]

Decode stdout strings from ASCII in landscape.lib.sysstats to support both Python 2 and 3.

We are on the journey to get the Bytes / String story solved for Python 2/3 compatibility.

This MP considers code in the landscape.lib.sysstats module which renders different status information of the system. To properly handle the information about logged in users, we need to improve convert the bytes to string for the error message and the return value.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 959
Branch: lp:~gocept/landscape-client/py3-sysstats
Jenkins: https://ci.lscape.net/job/latch-test-precise/904/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 959
Branch: lp:~gocept/landscape-client/py3-sysstats
Jenkins: https://ci.lscape.net/job/latch-test-xenial/1468/

review: Approve (test results)

[Alberto Donato (ack)]

+1

review: Approve

[Simon Poirier (simpoir)]

+1

review: Approve

=== modified file 'landscape/lib/sysstats.py'
--- landscape/lib/sysstats.py	2017-03-09 12:35:27 +0000
+++ landscape/lib/sysstats.py	2017-03-09 12:35:28 +0000
@@ -60,8 +60,9 @@
     def parse_output(args):
         stdout_data, stderr_data, status = args
         if status != 0:
-            raise CommandError(stderr_data)
-        first_line = stdout_data.split("\n", 1)[0]
+            raise CommandError(stderr_data.decode('ascii'))
+        first_line = stdout_data.split(b"\n", 1)[0]
+        first_line = first_line.decode('ascii')
         return sorted(set(first_line.split()))
     return result.addCallback(parse_output)