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-edit.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/python/tests/t-edit.py') diff --git a/lang/python/tests/t-edit.py b/lang/python/tests/t-edit.py index a3023e43..82f64019 100755 --- a/lang/python/tests/t-edit.py +++ b/lang/python/tests/t-edit.py @@ -23,7 +23,7 @@ del absolute_import, print_function, unicode_literals import sys import os -from gpg import core, constants +import gpg import support class KeyEditor(object): @@ -51,10 +51,10 @@ class KeyEditor(object): return result -support.init_gpgme(constants.PROTOCOL_OpenPGP) +support.init_gpgme(gpg.constants.PROTOCOL_OpenPGP) -c = core.Context() -c.set_pinentry_mode(constants.PINENTRY_MODE_LOOPBACK) +c = gpg.Context() +c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK) c.set_passphrase_cb(lambda *args: "abc") c.set_armor(True) @@ -65,7 +65,7 @@ c.interact(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False), assert editor.done # The deprecated interface. -sink = core.Data() +sink = gpg.Data() editor = KeyEditor() c.op_edit(c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False), editor.edit_fnc, sink, sink) -- cgit v1.2.3