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

[Steffen Allner]

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

This MP considers just a small part of code in the landscape.lib.gpg module which renders the error message.

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

This MP considers just a small part of code in the landscape.lib.gpg module which renders the error message.

[🤖 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-gpg
Jenkins: https://ci.lscape.net/job/latch-test-precise/896/

review: Approve (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-gpg
Jenkins: https://ci.lscape.net/job/latch-test-xenial/1460/

review: Approve (test results)

[Alberto Donato (ack)]

+1

[Alberto Donato (ack)]

review: Approve

[Geoff Teale (tealeg)]

+1 with a note inline.

review: Approve

[lp:~gocept/landscape-client/py3-gpg]

960. By Steffen Allner on 2017-03-13

Improve documentation and coding style.

[Steffen Allner (sallner)]

I improved the documentation and coding style.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Daniel Havlik (nilo)]

+1

review: Approve

=== modified file 'landscape/lib/gpg.py'
--- landscape/lib/gpg.py	2017-01-05 09:07:23 +0000
+++ landscape/lib/gpg.py	2017-03-13 08:57:59 +0000
@@ -24,6 +24,9 @@
 
     def check_gpg_exit_code(args):
         out, err, code = args
+        # We want a nice error message with Python 3 as well, so decode the
+        # bytes here.
+        out, err = out.decode("ascii"), err.decode("ascii")
         if code != 0:
             raise InvalidGPGSignature("%s failed (out='%s', err='%s', "
                                       "code='%d')" % (gpg, out, err, code))