From 6641c7814b30e3e8f18105b2636545cc1bd07552 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 14 Jun 2016 12:37:26 +0200 Subject: python: Simplify wrapping glue. * lang/python/pyme/core.py: Rename '_getctype' to '_ctype' and turn it into a string. Likewise rename '_getnameprepend' to '_cprefix'. * lang/python/helpers.c: Adapt accordingly. Signed-off-by: Justus Winter --- lang/python/helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lang/python/helpers.c') diff --git a/lang/python/helpers.c b/lang/python/helpers.c index 5380ff26..6de2b8de 100644 --- a/lang/python/helpers.c +++ b/lang/python/helpers.c @@ -171,7 +171,7 @@ PyObject * object_to_gpgme_t(PyObject *input, const char *objtype, int argnum) { PyObject *pyname = NULL, *pypointer = NULL; - pyname = PyObject_CallMethod(input, "_getctype", NULL); + pyname = PyObject_GetAttrString(input, "_ctype"); if (pyname && PyUnicode_Check(pyname)) { if (strcmp(PyUnicode_AsUTF8(pyname), objtype) != 0) @@ -261,7 +261,7 @@ object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, } /* As last resort we assume it is a wrapped data object. */ - if (PyObject_HasAttrString(data, "_getctype")) + if (PyObject_HasAttrString(data, "_ctype")) return object_to_gpgme_t(data, "gpgme_data_t", argnum); return PyErr_Format(PyExc_TypeError, -- cgit v1.2.3