[git] GPGME - branch, master, updated. gpgme-1.6.0-233-gfddcc62

[by Justus Winter]

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  fddcc62abd57cb04e84861abd3991c7d529c2464 (commit)
       via  b68700d2276f92756e556b3257ad5796db1c2aff (commit)
      from  a9670d152a4598aef1ae0960a79fb6f5d8db55ad (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 fddcc62abd57cb04e84861abd3991c7d529c2464
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 14 13:22:59 2016 +0200

    python: Fix test.
    
    * lang/python/tests/t-keylist.py: Do not assume key alpha is trusted
    yet.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/tests/t-keylist.py b/lang/python/tests/t-keylist.py
index a840d91..ee9c283 100755
--- a/lang/python/tests/t-keylist.py
+++ b/lang/python/tests/t-keylist.py
@@ -99,7 +99,7 @@ keys = [
       [ [ "Zulu Test", "demo key", "zulu at example.net" ] ], 1 ],
 ]
 
-def check_global(i, key, uids, n_subkeys):
+def check_global(key, uids, n_subkeys):
     assert not key.revoked, "Key unexpectedly revoked"
     assert not key.expired, "Key unexpectedly expired"
     assert not key.disabled, "Key unexpectedly disabled"
@@ -115,13 +115,8 @@ def check_global(i, key, uids, n_subkeys):
         "Key unexpectedly carries issuer name: {}".format(key.issuer_name)
     assert not key.chain_id, \
         "Key unexpectedly carries chain ID: {}".format(key.chain_id)
-
-    # Only key Alfa is trusted
-    assert i == 0 or key.owner_trust == constants.VALIDITY_UNKNOWN, \
-        "Key has unexpected owner trust: {}".format(key.owner_trust)
-    assert i != 0 or key.owner_trust == constants.VALIDITY_ULTIMATE, \
+    assert key.owner_trust == constants.VALIDITY_UNKNOWN, \
         "Key has unexpected owner trust: {}".format(key.owner_trust)
-
     assert len(key.subkeys) - 1 == n_subkeys, \
         "Key `{}' has unexpected number of subkeys".format(uids[0][0])
 
@@ -166,10 +161,7 @@ def check_subkey(fpr, which, subkey):
 def check_uid(which, ref, uid):
     assert not uid.revoked, which + " user ID unexpectedly revoked"
     assert not uid.invalid, which + " user ID unexpectedly invalid"
-    assert uid.validity == (constants.VALIDITY_UNKNOWN
-                            if uid.name.split()[0]
-                            not in {'Alfa', 'Alpha', 'Alice'} else
-                            constants.VALIDITY_ULTIMATE), \
+    assert uid.validity == constants.VALIDITY_UNKNOWN, \
       which + " user ID has unexpectedly validity: {}".format(uid.validity)
     assert not uid.signatures, which + " user ID unexpectedly signed"
     assert uid.name == ref[0], \
@@ -195,7 +187,7 @@ while key:
         break
 
     # Global key flags.
-    check_global(i, key, uids, n_subkeys)
+    check_global(key, uids, n_subkeys)
     check_subkey(fpr, "Primary", key.subkeys[0])
     check_subkey(sec_keyid, "Secondary", key.subkeys[1])
 
@@ -228,7 +220,7 @@ for i, key in enumerate(c.op_keylist_all(None, False)):
         break
 
     # Global key flags.
-    check_global(i, key, uids, n_subkeys)
+    check_global(key, uids, n_subkeys)
     check_subkey(fpr, "Primary", key.subkeys[0])
     check_subkey(sec_keyid, "Secondary", key.subkeys[1])
 

commit b68700d2276f92756e556b3257ad5796db1c2aff
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 14 12:34:56 2016 +0200

    python: Drop bad category.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
index 787d6a3..373e17c 100755
--- a/lang/python/setup.py.in
+++ b/lang/python/setup.py.in
@@ -159,7 +159,6 @@ setup(name="pyme3",
       classifiers=[
           'Development Status :: 4 - Beta',
           'Intended Audience :: Developers',
-          'Topic :: Software Development :: Build Tools',
           'License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3 :: Only',

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

Summary of changes:
 lang/python/setup.py.in        |  1 -
 lang/python/tests/t-keylist.py | 18 +++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)


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