From 837a4760533e80f075cd727f18354904b8a54132 Mon Sep 17 00:00:00 2001 From: Ben McGinnes Date: Sun, 30 Sep 2018 19:32:45 +1000 Subject: [PATCH] python bindings: fixing decrypt-verify * lang/python/src/core.py: First restoring the exception to the being just that. * The means to manipulate the error output is temporarily in commented out code, but ought to be added to a proper test later. * In the mean time the original test, with a very slight change, works again. Tested-by: Ben McGinnes Signed-off-by: Ben McGinnes --- lang/python/src/core.py | 11 ++++++----- lang/python/tests/t-decrypt-verify.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lang/python/src/core.py b/lang/python/src/core.py index 17ec0ef1..6e925925 100644 --- a/lang/python/src/core.py +++ b/lang/python/src/core.py @@ -450,10 +450,11 @@ class Context(GpgmeWrapper): try: raise errors.MissingSignatures(verify_result, missing, results=results) - except errors.MissingSignatures as miss_e: - mse = miss_e - mserr = "gpg.errors.MissingSignatures:" - print(mserr, miss_e, "\n") + 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 = [] @@ -468,7 +469,7 @@ class Context(GpgmeWrapper): # msl.append(user.email) # # msl.append(user.uid) # print(" ".join(msl)) - return mse + # raise mse return results diff --git a/lang/python/tests/t-decrypt-verify.py b/lang/python/tests/t-decrypt-verify.py index fcaa1346..991d18c9 100755 --- a/lang/python/tests/t-decrypt-verify.py +++ b/lang/python/tests/t-decrypt-verify.py @@ -70,7 +70,7 @@ with gpg.Context() as c: try: c.decrypt( open(support.make_filename("cipher-2.asc")), verify=[alpha, bob]) - except gpg.errors.MissingSignatures as e: + except Exception as e: assert len(e.missing) == 1 assert e.missing[0] == bob else: