From a458e7fe2006d92bd5a838e2747fb66bbac4b1b8 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Fri, 16 Sep 2016 14:56:29 +0200 Subject: python: Adapt to 'gpgme_op_interact'. * lang/python/examples/inter-edit.py: Update example. * lang/python/gpgme.i (gpgme_edit_cb_t): Turn into 'gpgme_interact_cb_t'. * lang/python/helpers.c (_pyme_edit_cb): Turn into '_pyme_interact_cb_t'. * lang/python/private.h (_pyme_edit_cb): Likewise. * lang/python/pyme/constants/__init__.py: Replace numeric status codes with the keywords. * lang/python/pyme/constants/status.py: Likewise. * lang/python/pyme/core.py (Context.interact): New method. (Context.op_edit): Deprecate, update docstring, implement using Context.interact. * lang/python/tests/t-edit.py: Test both interfaces. Signed-off-by: Justus Winter --- lang/python/gpgme.i | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/python/gpgme.i') diff --git a/lang/python/gpgme.i b/lang/python/gpgme.i index 458ae7f1..84addae2 100644 --- a/lang/python/gpgme.i +++ b/lang/python/gpgme.i @@ -476,15 +476,15 @@ -// Include mapper for edit callbacks -%typemap(in) (gpgme_edit_cb_t fnc, void *fnc_value) { +/* Include mapper for interact callbacks. */ +%typemap(in) (gpgme_interact_cb_t fnc, void *fnc_value) { if (! PyTuple_Check($input)) - return PyErr_Format(PyExc_TypeError, "edit callback must be a tuple"); + return PyErr_Format(PyExc_TypeError, "interact callback must be a tuple"); if (PyTuple_Size($input) != 2 && PyTuple_Size($input) != 3) return PyErr_Format(PyExc_TypeError, - "edit callback must be a tuple of size 2 or 3"); + "interact callback must be a tuple of size 2 or 3"); - $1 = (gpgme_edit_cb_t) _pyme_edit_cb; + $1 = (gpgme_interact_cb_t) _pyme_interact_cb; $2 = $input; } -- cgit v1.2.3