diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2018-11-28 01:22:13 -0500 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2018-12-05 02:40:24 +0300 |
| commit | 827a2f3ad562a5927ceb89a842779b4b8c57c367 (patch) | |
| tree | 1db902061457c7607906280e653716d876f3ee68 | |
| parent | c8a04af676d981b42172c9bdad82eb83f91c8ce6 (diff) | |
| download | gpgme-827a2f3ad562a5927ceb89a842779b4b8c57c367.tar.gz | |
python: simplify Context.decrypt()
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>
| -rw-r--r-- | lang/python/src/core.py | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/lang/python/src/core.py b/lang/python/src/core.py index 6e925925..f7e843f1 100644 --- a/lang/python/src/core.py +++ b/lang/python/src/core.py @@ -386,13 +386,9 @@ class Context(GpgmeWrapper): if verify is False: verify = True sink_result = True - else: - pass elif isinstance(verify, list) is True: if len(verify) > 0: verify_sigs = True - else: - pass else: verify = True self.op_decrypt_verify(ciphertext, plaintext) @@ -447,29 +443,8 @@ class Context(GpgmeWrapper): if not ok: missing.append(key) if missing: - try: - raise errors.MissingSignatures(verify_result, missing, - 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 + raise errors.MissingSignatures(verify_result, missing, + results=results) return results |