From 4b3264345084a0c9bf9f97fb233df700d7608e66 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 31 Oct 2016 15:28:26 +0100 Subject: 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 --- lang/python/tests/t-decrypt-verify.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lang/python/tests/t-decrypt-verify.py') diff --git a/lang/python/tests/t-decrypt-verify.py b/lang/python/tests/t-decrypt-verify.py index 1fa7a6f0..62431671 100755 --- a/lang/python/tests/t-decrypt-verify.py +++ b/lang/python/tests/t-decrypt-verify.py @@ -31,10 +31,10 @@ def check_verify_result(result, summary, fpr, status): assert gpg.errors.GPGMEError(sig.status).getcode() == status assert len(sig.notations) == 0 assert not sig.wrong_key_usage - assert sig.validity == gpg.constants.VALIDITY_FULL + assert sig.validity == gpg.constants.validity.FULL assert gpg.errors.GPGMEError(sig.validity_reason).getcode() == gpg.errors.NO_ERROR -support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +support.init_gpgme(gpg.constants.protocol.OpenPGP) c = gpg.Context() source = gpg.Data(file=support.make_filename("cipher-2.asc")) @@ -49,7 +49,7 @@ support.print_data(sink) verify_result = c.op_verify_result() check_verify_result(verify_result, - gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, + gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR) @@ -62,7 +62,7 @@ with gpg.Context() as c: assert plaintext.find(b'Wenn Sie dies lesen k') >= 0, \ 'Plaintext not found' check_verify_result(verify_result, - gpg.constants.SIGSUM_VALID | gpg.constants.SIGSUM_GREEN, + gpg.constants.sigsum.VALID | gpg.constants.sigsum.GREEN, "A0FF4590BB6122EDEF6E3C542D727CC768697734", gpg.errors.NO_ERROR) -- cgit v1.2.3