From 4e8a92ed14ea3da3d92f07d5f62fd325a2adebde Mon Sep 17 00:00:00 2001 From: Ben McGinnes Date: Sun, 16 Sep 2018 03:34:36 +1000 Subject: [PATCH] Python bindings: examples * lang/python/examples/howto/export-secret-keys.py and groups.py: Updated the backwards compatibility adjustments to account for unicode differences between python 2 and 3. --- lang/python/examples/howto/export-secret-keys.py | 5 ++++- lang/python/examples/howto/groups.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lang/python/examples/howto/export-secret-keys.py b/lang/python/examples/howto/export-secret-keys.py index 7203ded9..0f4d8ee4 100755 --- a/lang/python/examples/howto/export-secret-keys.py +++ b/lang/python/examples/howto/export-secret-keys.py @@ -90,7 +90,10 @@ else: process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE) procom = process.communicate() - hd = procom[0].decode().strip() + if sys.version_info[0] == 2: + hd = procom[0].strip() + else: + hd = procom[0].decode().strip() gpgfile = "{0}/{1}.gpg".format(hd, keyfile) ascfile = "{0}/{1}.asc".format(hd, keyfile) diff --git a/lang/python/examples/howto/groups.py b/lang/python/examples/howto/groups.py index 154961b1..72135382 100644 --- a/lang/python/examples/howto/groups.py +++ b/lang/python/examples/howto/groups.py @@ -42,7 +42,10 @@ try: except: process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE) procom = process.communicate() - lines = procom[0].decode().splitlines() + if sys.version_info[0] == 2: + lines = procom[0].splitlines() + else: + lines = procom[0].decode().splitlines() for i in range(len(lines)): if lines[i].startswith("group") is True: