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/private.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lang/python/private.h') diff --git a/lang/python/private.h b/lang/python/private.h index cb4d2f80..3a903c18 100644 --- a/lang/python/private.h +++ b/lang/python/private.h @@ -34,9 +34,8 @@ PyObject *_pyme_obj2gpgme_data_t(PyObject *input, int argnum, PyObject *_pyme_wrap_result(PyObject *fragile, const char *classname); -gpgme_error_t _pyme_edit_cb(void *opaque, gpgme_status_code_t status, - const char *args, int fd); - +gpgme_error_t _pyme_interact_cb(void *opaque, const char *keyword, + const char *args, int fd); gpgme_error_t _pyme_assuan_data_cb (void *hook, const void *data, size_t datalen); gpgme_error_t _pyme_assuan_inquire_cb (void *hook, -- cgit v1.2.3