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-large.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lang/python/tests/t-encrypt-large.py') diff --git a/lang/python/tests/t-encrypt-large.py b/lang/python/tests/t-encrypt-large.py index 25373d73..1c3c4f61 100755 --- a/lang/python/tests/t-encrypt-large.py +++ b/lang/python/tests/t-encrypt-large.py @@ -22,7 +22,7 @@ del absolute_import, print_function, unicode_literals import sys import random -from gpg import core, constants +import gpg import support if len(sys.argv) == 2: @@ -30,8 +30,8 @@ if len(sys.argv) == 2: else: nbytes = 100000 -support.init_gpgme(constants.PROTOCOL_OpenPGP) -c = core.Context() +support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +c = gpg.Context() ntoread = nbytes def read_cb(amount): @@ -48,14 +48,14 @@ def write_cb(data): nwritten += len(data) return len(data) -source = core.Data(cbs=(read_cb, None, None, lambda: None)) -sink = core.Data(cbs=(None, write_cb, None, lambda: None)) +source = gpg.Data(cbs=(read_cb, None, None, lambda: None)) +sink = gpg.Data(cbs=(None, write_cb, None, lambda: None)) keys = [] keys.append(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)) keys.append(c.get_key("D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2", False)) -c.op_encrypt(keys, constants.ENCRYPT_ALWAYS_TRUST, source, sink) +c.op_encrypt(keys, 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) -- cgit v1.2.3