From 20dc37a0e7e1531b0e568a6ec29b1c2d18de59c3 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 31 Oct 2016 14:42:26 +0100 Subject: python: Import the topmost module in tests and examples. * examples/verifydetails.py: Only import the topmost module 'gpg' and update the code accordingly. * tests/support.py: Likewise. * tests/t-callbacks.py: Likewise. * tests/t-data.py: Likewise. * tests/t-decrypt-verify.py: Likewise. * tests/t-decrypt.py: Likewise. * tests/t-edit.py: Likewise. * tests/t-encrypt-large.py: Likewise. * tests/t-encrypt-sign.py: Likewise. * tests/t-encrypt-sym.py: Likewise. * tests/t-encrypt.py: Likewise. * tests/t-export.py: Likewise. * tests/t-file-name.py: Likewise. * tests/t-import.py: Likewise. * tests/t-keylist.py: Likewise. * tests/t-sig-notation.py: Likewise. * tests/t-sign.py: Likewise. * tests/t-signers.py: Likewise. * tests/t-trustlist.py: Likewise. * tests/t-verify.py: Likewise. * tests/t-wait.py: Likewise. * tests/t-wrapper.py: Likewise. Signed-off-by: Justus Winter --- lang/python/tests/t-encrypt-sign.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'lang/python/tests/t-encrypt-sign.py') diff --git a/lang/python/tests/t-encrypt-sign.py b/lang/python/tests/t-encrypt-sign.py index a1197e51..9b062026 100755 --- a/lang/python/tests/t-encrypt-sign.py +++ b/lang/python/tests/t-encrypt-sign.py @@ -22,11 +22,10 @@ del absolute_import, print_function, unicode_literals import sys import gpg -from gpg import core, constants import support -support.init_gpgme(constants.PROTOCOL_OpenPGP) -c = core.Context() +support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +c = gpg.Context() c.set_armor(True) def check_result(r, typ): @@ -40,11 +39,11 @@ def check_result(r, typ): if signature.type != typ: sys.exit("Wrong type of signature created") - if signature.pubkey_algo != 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 (constants.MD_SHA1, 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)) @@ -60,17 +59,17 @@ keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)) keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False)) for recipients in (keys, []): - source = core.Data("Hallo Leute\n") - sink = core.Data() + source = gpg.Data("Hallo Leute\n") + sink = gpg.Data() - c.op_encrypt_sign(recipients, constants.ENCRYPT_ALWAYS_TRUST, source, sink) + c.op_encrypt_sign(recipients, gpg.constants.ENCRYPT_ALWAYS_TRUST, source, sink) result = c.op_encrypt_result() assert not result.invalid_recipients, \ "Invalid recipient encountered: {}".format( result.invalid_recipients.fpr) result = c.op_sign_result() - check_result(result, constants.SIG_MODE_NORMAL) + check_result(result, gpg.constants.SIG_MODE_NORMAL) support.print_data(sink) @@ -83,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, 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) -- cgit v1.2.3