diff options
| author | Justus Winter <[email protected]> | 2016-10-31 14:28:26 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-10-31 14:42:35 +0000 |
| commit | 4b3264345084a0c9bf9f97fb233df700d7608e66 (patch) | |
| tree | cecaf14d620fee63b54de2d095dca4b24a79d51d /lang/python/tests/t-encrypt-sign.py | |
| parent | python: Import the topmost module in tests and examples. (diff) | |
| download | gpgme-4b3264345084a0c9bf9f97fb233df700d7608e66.tar.gz gpgme-4b3264345084a0c9bf9f97fb233df700d7608e66.zip | |
python: Use vanity modules for constants in tests and examples.
* lang/python/gpg/constants/sig/notation.py: New file.
* lang/python/gpg/constants/sig/__init__.py: Import new module.
* lang/python/examples/assuan.py: Use more specific module for
constants, e.g. 'protocol.ASSUAN' instead of 'PROTOCOL_ASSUAN'.
* lang/python/examples/testCMSgetkey.py: Likewise.
* lang/python/tests/initial.py: Likewise.
* lang/python/tests/t-callbacks.py: Likewise.
* lang/python/tests/t-decrypt-verify.py: Likewise.
* lang/python/tests/t-decrypt.py: Likewise.
* lang/python/tests/t-edit.py: Likewise.
* lang/python/tests/t-encrypt-large.py: Likewise.
* lang/python/tests/t-encrypt-sign.py: Likewise.
* lang/python/tests/t-encrypt-sym.py: Likewise.
* lang/python/tests/t-encrypt.py: Likewise.
* lang/python/tests/t-export.py: Likewise.
* lang/python/tests/t-file-name.py: Likewise.
* lang/python/tests/t-idiomatic.py: Likewise.
* lang/python/tests/t-import.py: Likewise.
* lang/python/tests/t-keylist.py: Likewise.
* lang/python/tests/t-protocol-assuan.py: Likewise.
* lang/python/tests/t-sig-notation.py: Likewise.
* lang/python/tests/t-sign.py: Likewise.
* lang/python/tests/t-signers.py: Likewise.
* lang/python/tests/t-trustlist.py: Likewise.
* lang/python/tests/t-verify.py: Likewise.
* lang/python/tests/t-wait.py: Likewise.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'lang/python/tests/t-encrypt-sign.py')
| -rwxr-xr-x | lang/python/tests/t-encrypt-sign.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/python/tests/t-encrypt-sign.py b/lang/python/tests/t-encrypt-sign.py index 9b062026..094a2b00 100755 --- a/lang/python/tests/t-encrypt-sign.py +++ b/lang/python/tests/t-encrypt-sign.py @@ -24,7 +24,7 @@ import sys import gpg import support -support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +support.init_gpgme(gpg.constants.protocol.OpenPGP) c = gpg.Context() c.set_armor(True) @@ -39,11 +39,11 @@ def check_result(r, typ): if signature.type != typ: sys.exit("Wrong type of signature created") - if signature.pubkey_algo != gpg.constants.PK_DSA: + if signature.pubkey_algo != gpg.constants.pk.DSA: sys.exit("Wrong pubkey algorithm reported: {}".format( signature.pubkey_algo)) - if signature.hash_algo not in (gpg.constants.MD_SHA1, gpg.constants.MD_RMD160): + if signature.hash_algo not in (gpg.constants.md.SHA1, gpg.constants.md.RMD160): sys.exit("Wrong hash algorithm reported: {}".format( signature.hash_algo)) @@ -69,7 +69,7 @@ for recipients in (keys, []): result.invalid_recipients.fpr) result = c.op_sign_result() - check_result(result, gpg.constants.SIG_MODE_NORMAL) + check_result(result, gpg.constants.sig.mode.NORMAL) support.print_data(sink) @@ -82,7 +82,7 @@ with gpg.Context(armor=True) as c: always_trust=True) assert len(ciphertext) > 0 assert ciphertext.find(b'BEGIN PGP MESSAGE') > 0, 'Marker not found' - check_result(sig_result, gpg.constants.SIG_MODE_NORMAL) + check_result(sig_result, gpg.constants.sig.mode.NORMAL) c.signers = [c.get_key(support.sign_only, True)] c.encrypt(message, recipients=keys, always_trust=True) |