GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: simplify Context.decrypt()

Browse Source 
In the course of trying to address https://dev.gnupg.org/T4271, i
discovered that gpg.Context.decrypt() has a bit of superfluous code.
This changeset is intended to simplify the code without making any
functional changes.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
This commit is contained in:
Daniel Kahn Gillmor 2018-11-28 01:22:13 -05:00 committed by Andre Heinecke
parent 1dffdcc6e9
commit 2491e6f92f
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lang/python/src/core.py
View File

@ -386,13 +386,9 @@ class Context(GpgmeWrapper):
if verify is False: if verify is False:
verify = True verify = True
sink_result = True sink_result = True
else:
pass
elif isinstance(verify, list) is True: elif isinstance(verify, list) is True:
if len(verify) > 0: if len(verify) > 0:
verify_sigs = True verify_sigs = True
else:
pass
else: else:
verify = True verify = True
self.op_decrypt_verify(ciphertext, plaintext) self.op_decrypt_verify(ciphertext, plaintext)
@ -447,29 +443,8 @@ class Context(GpgmeWrapper):
if not ok: if not ok:
missing.append(key) missing.append(key)
if missing: if missing:
try:
raise errors.MissingSignatures(verify_result, missing, raise errors.MissingSignatures(verify_result, missing,
results=results) results=results)
except errors.MissingSignatures as e:
raise e
# mse = e
# mserr = "gpg.errors.MissingSignatures:"
# print(mserr, miss_e, "\n")
# # The full details can then be found in mse.results,
# # mse.result, mse.missing if necessary.
# mse_list = []
# msp = "Missing signatures from: \n".format()
# print(msp)
# for key in mse.missing:
# mse_list.append(key.fpr)
# msl = []
# msl.append(key.fpr)
# for user in key.uids:
# msl.append(user.name)
# msl.append(user.email)
# # msl.append(user.uid)
# print(" ".join(msl))
# raise mse
return results return results