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-sig-notation.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lang/python/tests/t-sig-notation.py') diff --git a/lang/python/tests/t-sig-notation.py b/lang/python/tests/t-sig-notation.py index 050ef6be..f1342b1f 100755 --- a/lang/python/tests/t-sig-notation.py +++ b/lang/python/tests/t-sig-notation.py @@ -25,10 +25,10 @@ import gpg import support expected_notations = { - "laughing@me": ("Just Squeeze Me", gpg.constants.SIG_NOTATION_HUMAN_READABLE), + "laughing@me": ("Just Squeeze Me", gpg.constants.sig.notation.HUMAN_READABLE), "preferred-email-encoding@pgp.com": ("pgpmime", - gpg.constants.SIG_NOTATION_HUMAN_READABLE - | gpg.constants.SIG_NOTATION_CRITICAL), + gpg.constants.sig.notation.HUMAN_READABLE + | gpg.constants.sig.notation.CRITICAL), None: ("http://www.gnu.org/policy/", 0), } @@ -55,14 +55,14 @@ def check_result(result): assert r.value == value, \ "Expected {!r}, got {!r}".format(value, r.value) assert r.human_readable \ - == bool(flags & gpg.constants.SIG_NOTATION_HUMAN_READABLE) + == bool(flags & gpg.constants.sig.notation.HUMAN_READABLE) assert r.critical \ - == (bool(flags & gpg.constants.SIG_NOTATION_CRITICAL) + == (bool(flags & gpg.constants.sig.notation.CRITICAL) if have_correct_sig_data else False) assert len(expected_notations) == 0 -support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +support.init_gpgme(gpg.constants.protocol.OpenPGP) source = gpg.Data("Hallo Leute\n") signed = gpg.Data() @@ -71,7 +71,7 @@ c = gpg.Context() for name, (value, flags) in expected_notations.items(): c.sig_notation_add(name, value, flags) -c.op_sign(source, signed, gpg.constants.SIG_MODE_NORMAL) +c.op_sign(source, signed, gpg.constants.sig.mode.NORMAL) signed.seek(0, os.SEEK_SET) sink = gpg.Data() -- cgit v1.2.3