[git] GPGME - branch, master, updated. gpgme-1.11.1-312-g837a476

by Ben McGinnes cvs at cvs.gnupg.org
Sun Sep 30 11:34:31 CEST 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  837a4760533e80f075cd727f18354904b8a54132 (commit)
      from  11403a46358f9b6e98776974f3c70f211d9adf85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 837a4760533e80f075cd727f18354904b8a54132
Author: Ben McGinnes <ben at adversary.org>
Date:   Sun Sep 30 19:32:45 2018 +1000

    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 <ben at adversary.org>
    Signed-off-by: Ben McGinnes <ben at adversary.org>

diff --git a/lang/python/src/core.py b/lang/python/src/core.py
index 17ec0ef..6e92592 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 fcaa134..991d18c 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:

-----------------------------------------------------------------------

Summary of changes:
 lang/python/src/core.py               | 11 ++++++-----
 lang/python/tests/t-decrypt-verify.py |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list