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.
This commit is contained in:
Ben McGinnes 2018-09-16 03:34:36 +10:00
parent 864ef9b40f
commit 4e8a92ed14
2 changed files with 8 additions and 2 deletions

View File

@ -90,7 +90,10 @@ else:
process = subprocess.Popen(gpgconfcmd.split(), process = subprocess.Popen(gpgconfcmd.split(),
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
procom = process.communicate() 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) gpgfile = "{0}/{1}.gpg".format(hd, keyfile)
ascfile = "{0}/{1}.asc".format(hd, keyfile) ascfile = "{0}/{1}.asc".format(hd, keyfile)

View File

@ -42,7 +42,10 @@ try:
except: except:
process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE) process = subprocess.Popen(gpgconfcmd.split(), stdout=subprocess.PIPE)
procom = process.communicate() 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)): for i in range(len(lines)):
if lines[i].startswith("group") is True: if lines[i].startswith("group") is True: