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-import.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/python/tests/t-import.py') diff --git a/lang/python/tests/t-import.py b/lang/python/tests/t-import.py index 1d15b96b..68ad6d7d 100755 --- a/lang/python/tests/t-import.py +++ b/lang/python/tests/t-import.py @@ -20,7 +20,7 @@ from __future__ import absolute_import, print_function, unicode_literals del absolute_import, print_function, unicode_literals -from gpg import core, constants +import gpg import support def check_result(result, fpr, secret): @@ -67,13 +67,13 @@ def check_result(result, fpr, secret): assert len(result.imports) == 1 or fpr == result.imports[1].fpr assert result.imports[0].result == 0 -support.init_gpgme(constants.PROTOCOL_OpenPGP) -c = core.Context() +support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) +c = gpg.Context() -c.op_import(core.Data(file=support.make_filename("pubkey-1.asc"))) +c.op_import(gpg.Data(file=support.make_filename("pubkey-1.asc"))) result = c.op_import_result() check_result(result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", False) -c.op_import(core.Data(file=support.make_filename("seckey-1.asc"))) +c.op_import(gpg.Data(file=support.make_filename("seckey-1.asc"))) result = c.op_import_result() check_result(result, "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", True) -- cgit v1.2.3