GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Rename private functions.

Browse Source 
Avoid the name pygpgme, as this is the name of another popular Python
binding for GPGME.

This commit renames all functions that are not exported to the Python
world.

* lang/python/gpgme.i: Rename all private functions.
* lang/python/helpers.c: Likewise.
* lang/python/helpers.h: Likewise.
* lang/python/private.h: Likewise.  Also move the SWIG runtime helper
prototypes here.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-07-28 14:51:20 +02:00
parent de69fa496c
commit 1d2f22aae6
4 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lang/python/gpgme.i
View File

@ -135,7 +135,7 @@
$1 = NULL; $1 = NULL;
else { else {
PyObject *pypointer; PyObject *pypointer;
pypointer = object_to_gpgme_data_t($input, $argnum, &wrapper, pypointer = _pyme_obj2gpgme_data_t($input, $argnum, &wrapper,
&bytesio, &view); &bytesio, &view);
if (pypointer == NULL) if (pypointer == NULL)
return NULL; return NULL;
@ -349,7 +349,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "EncryptResult"); $result = _pyme_wrap_result(fragile, "EncryptResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -357,7 +357,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "DecryptResult"); $result = _pyme_wrap_result(fragile, "DecryptResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -365,7 +365,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "SignResult"); $result = _pyme_wrap_result(fragile, "SignResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -373,7 +373,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "VerifyResult"); $result = _pyme_wrap_result(fragile, "VerifyResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -381,7 +381,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "ImportResult"); $result = _pyme_wrap_result(fragile, "ImportResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -389,7 +389,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "GenkeyResult"); $result = _pyme_wrap_result(fragile, "GenkeyResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -397,7 +397,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "KeylistResult"); $result = _pyme_wrap_result(fragile, "KeylistResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -405,7 +405,7 @@
PyObject *fragile; PyObject *fragile;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr($1), $1_descriptor,
%newpointer_flags); %newpointer_flags);
$result = pygpgme_wrap_fragile_result(fragile, "VFSMountResult"); $result = _pyme_wrap_result(fragile, "VFSMountResult");
Py_DECREF(fragile); Py_DECREF(fragile);
} }
@ -421,7 +421,7 @@
PyObject *fragile, *o; PyObject *fragile, *o;
fragile = SWIG_NewPointerObj(SWIG_as_voidptr(curr), $1_descriptor, fragile = SWIG_NewPointerObj(SWIG_as_voidptr(curr), $1_descriptor,
%newpointer_flags); %newpointer_flags);
o = pygpgme_wrap_fragile_result(fragile, "EngineInfo"); o = _pyme_wrap_result(fragile, "EngineInfo");
if (o == NULL) if (o == NULL)
return NULL; /* raise */ return NULL; /* raise */
Py_DECREF(fragile); Py_DECREF(fragile);
@ -439,7 +439,7 @@
return PyErr_Format(PyExc_TypeError, return PyErr_Format(PyExc_TypeError,
"edit callback must be a tuple of size 2 or 3"); "edit callback must be a tuple of size 2 or 3");
$1 = (gpgme_edit_cb_t) pyEditCb; $1 = (gpgme_edit_cb_t) _pyme_edit_cb;
$2 = $input; $2 = $input;
} }
@ -555,15 +555,15 @@ FILE *fdopen(int fildes, const char *mode);
#include "helpers.h" #include "helpers.h"
#include "private.h" #include "private.h"
/* SWIG support for helpers.c */ /* SWIG runtime support for helpers.c */
PyObject * PyObject *
pygpgme_wrap_gpgme_data_t(gpgme_data_t data) _pyme_wrap_gpgme_data_t(gpgme_data_t data)
{ {
return SWIG_Python_NewPointerObj(NULL, data, SWIGTYPE_p_gpgme_data, 0); return SWIG_Python_NewPointerObj(NULL, data, SWIGTYPE_p_gpgme_data, 0);
} }
gpgme_ctx_t gpgme_ctx_t
pygpgme_unwrap_gpgme_ctx_t(PyObject *wrapped) _pyme_unwrap_gpgme_ctx_t(PyObject *wrapped)
{ {
gpgme_ctx_t result; gpgme_ctx_t result;
if (SWIG_ConvertPtr(wrapped, if (SWIG_ConvertPtr(wrapped,

94
lang/python/helpers.c
View File

@ -30,7 +30,7 @@
static PyObject *GPGMEError = NULL; static PyObject *GPGMEError = NULL;
void pygpgme_exception_init(void) { void _pyme_exception_init(void) {
if (GPGMEError == NULL) { if (GPGMEError == NULL) {
PyObject *errors; PyObject *errors;
PyObject *from_list = PyList_New(0); PyObject *from_list = PyList_New(0);
@ -45,11 +45,11 @@ void pygpgme_exception_init(void) {
} }
static PyObject * static PyObject *
pygpgme_raise_exception(gpgme_error_t err) _pyme_raise_exception(gpgme_error_t err)
{ {
PyObject *e; PyObject *e;
pygpgme_exception_init(); _pyme_exception_init();
if (GPGMEError == NULL) if (GPGMEError == NULL)
return PyErr_Format(PyExc_RuntimeError, "Got gpgme_error_t %d", err); return PyErr_Format(PyExc_RuntimeError, "Got gpgme_error_t %d", err);
@ -63,7 +63,7 @@ pygpgme_raise_exception(gpgme_error_t err)
return NULL; /* raise */ return NULL; /* raise */
} }
gpgme_error_t pygpgme_exception2code(void) { gpgme_error_t _pyme_exception2code(void) {
gpgme_error_t err_status = gpg_error(GPG_ERR_GENERAL); gpgme_error_t err_status = gpg_error(GPG_ERR_GENERAL);
if (GPGMEError && PyErr_ExceptionMatches(GPGMEError)) { if (GPGMEError && PyErr_ExceptionMatches(GPGMEError)) {
PyObject *type = 0, *value = 0, *traceback = 0; PyObject *type = 0, *value = 0, *traceback = 0;
@ -81,7 +81,7 @@ gpgme_error_t pygpgme_exception2code(void) {
/* Exception support for callbacks. */ /* Exception support for callbacks. */
#define EXCINFO "_callback_excinfo" #define EXCINFO "_callback_excinfo"
static void pygpgme_stash_callback_exception(PyObject *weak_self) static void _pyme_stash_callback_exception(PyObject *weak_self)
{ {
PyObject *self, *ptype, *pvalue, *ptraceback, *excinfo; PyObject *self, *ptype, *pvalue, *ptraceback, *excinfo;
@ -176,7 +176,7 @@ PyObject *pygpgme_raise_callback_exception(PyObject *self)
/* Convert object to a pointer to gpgme type, generic version. */ /* Convert object to a pointer to gpgme type, generic version. */
PyObject * PyObject *
object_to_gpgme_t(PyObject *input, const char *objtype, int argnum) _pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum)
{ {
PyObject *pyname = NULL, *pypointer = NULL; PyObject *pyname = NULL, *pypointer = NULL;
pyname = PyObject_GetAttrString(input, "_ctype"); pyname = PyObject_GetAttrString(input, "_ctype");
@ -210,7 +210,7 @@ object_to_gpgme_t(PyObject *input, const char *objtype, int argnum)
objects with a fileno method, returning it in WRAPPER. This object objects with a fileno method, returning it in WRAPPER. This object
must be de-referenced when no longer needed. */ must be de-referenced when no longer needed. */
PyObject * PyObject *
object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper, _pyme_obj2gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
PyObject **bytesio, Py_buffer *view) PyObject **bytesio, Py_buffer *view)
{ {
gpgme_error_t err; gpgme_error_t err;
@ -223,9 +223,9 @@ object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
err = gpgme_data_new_from_fd(wrapper, (int) PyLong_AsLong(fd)); err = gpgme_data_new_from_fd(wrapper, (int) PyLong_AsLong(fd));
Py_DECREF(fd); Py_DECREF(fd);
if (err) if (err)
return pygpgme_raise_exception (err); return _pyme_raise_exception (err);
return pygpgme_wrap_gpgme_data_t(*wrapper); return _pyme_wrap_gpgme_data_t(*wrapper);
} }
else else
PyErr_Clear(); PyErr_Clear();
@ -264,14 +264,14 @@ object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
err = gpgme_data_new_from_mem(wrapper, view->buf, (size_t) view->len, 0); err = gpgme_data_new_from_mem(wrapper, view->buf, (size_t) view->len, 0);
if (err) if (err)
return pygpgme_raise_exception (err); return _pyme_raise_exception (err);
return pygpgme_wrap_gpgme_data_t(*wrapper); return _pyme_wrap_gpgme_data_t(*wrapper);
} }
/* As last resort we assume it is a wrapped data object. */ /* As last resort we assume it is a wrapped data object. */
if (PyObject_HasAttrString(data, "_ctype")) if (PyObject_HasAttrString(data, "_ctype"))
return object_to_gpgme_t(data, "gpgme_data_t", argnum); return _pyme_obj2gpgme_t(data, "gpgme_data_t", argnum);
return PyErr_Format(PyExc_TypeError, return PyErr_Format(PyExc_TypeError,
"arg %d: expected pyme.Data, file, or an object " "arg %d: expected pyme.Data, file, or an object "
@ -282,7 +282,7 @@ object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_data_t *wrapper,
PyObject * PyObject *
pygpgme_wrap_fragile_result(PyObject *fragile, const char *classname) _pyme_wrap_result(PyObject *fragile, const char *classname)
{ {
static PyObject *results; static PyObject *results;
PyObject *class; PyObject *class;
@ -327,7 +327,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
PyObject *dataarg = NULL; PyObject *dataarg = NULL;
gpgme_error_t err_status = 0; gpgme_error_t err_status = 0;
pygpgme_exception_init(); _pyme_exception_init();
assert (PyTuple_Check(pyhook)); assert (PyTuple_Check(pyhook));
assert (PyTuple_Size(pyhook) == 2 || PyTuple_Size(pyhook) == 3); assert (PyTuple_Size(pyhook) == 2 || PyTuple_Size(pyhook) == 3);
@ -364,12 +364,12 @@ static gpgme_error_t pyPassphraseCb(void *hook,
retval = PyObject_CallObject(func, args); retval = PyObject_CallObject(func, args);
Py_DECREF(args); Py_DECREF(args);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
err_status = pygpgme_exception2code(); err_status = _pyme_exception2code();
} else { } else {
if (!retval) { if (!retval) {
if (write(fd, "\n", 1) < 0) { if (write(fd, "\n", 1) < 0) {
err_status = gpgme_error_from_syserror (); err_status = gpgme_error_from_syserror ();
pygpgme_raise_exception (err_status); _pyme_raise_exception (err_status);
} }
} else { } else {
char *buf; char *buf;
@ -394,11 +394,11 @@ static gpgme_error_t pyPassphraseCb(void *hook,
if (write(fd, buf, len) < 0) { if (write(fd, buf, len) < 0) {
err_status = gpgme_error_from_syserror (); err_status = gpgme_error_from_syserror ();
pygpgme_raise_exception (err_status); _pyme_raise_exception (err_status);
} }
if (! err_status && write(fd, "\n", 1) < 0) { if (! err_status && write(fd, "\n", 1) < 0) {
err_status = gpgme_error_from_syserror (); err_status = gpgme_error_from_syserror ();
pygpgme_raise_exception (err_status); _pyme_raise_exception (err_status);
} }
Py_DECREF(retval); Py_DECREF(retval);
@ -407,7 +407,7 @@ static gpgme_error_t pyPassphraseCb(void *hook,
leave: leave:
if (err_status) if (err_status)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err_status; return err_status;
} }
@ -424,7 +424,7 @@ pygpgme_set_passphrase_cb(PyObject *self, PyObject *cb) {
return NULL; return NULL;
} }
ctx = pygpgme_unwrap_gpgme_ctx_t(wrapped); ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
Py_DECREF(wrapped); Py_DECREF(wrapped);
if (ctx == NULL) if (ctx == NULL)
{ {
@ -475,7 +475,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what), PyTuple_SetItem(args, 0, PyUnicode_DecodeUTF8(what, strlen (what),
"strict")); "strict"));
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
Py_DECREF(args); Py_DECREF(args);
return; return;
} }
@ -489,7 +489,7 @@ static void pyProgressCb(void *hook, const char *what, int type, int current,
retval = PyObject_CallObject(func, args); retval = PyObject_CallObject(func, args);
if (PyErr_Occurred()) if (PyErr_Occurred())
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
Py_DECREF(args); Py_DECREF(args);
Py_XDECREF(retval); Py_XDECREF(retval);
} }
@ -506,7 +506,7 @@ pygpgme_set_progress_cb(PyObject *self, PyObject *cb) {
return NULL; return NULL;
} }
ctx = pygpgme_unwrap_gpgme_ctx_t(wrapped); ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
Py_DECREF(wrapped); Py_DECREF(wrapped);
if (ctx == NULL) if (ctx == NULL)
{ {
@ -581,13 +581,13 @@ static gpgme_error_t pyStatusCb(void *hook, const char *keyword,
retval = PyObject_CallObject(func, pyargs); retval = PyObject_CallObject(func, pyargs);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = pygpgme_exception2code(); err = _pyme_exception2code();
Py_DECREF(pyargs); Py_DECREF(pyargs);
Py_XDECREF(retval); Py_XDECREF(retval);
leave: leave:
if (err) if (err)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;
} }
@ -603,7 +603,7 @@ pygpgme_set_status_cb(PyObject *self, PyObject *cb) {
return NULL; return NULL;
} }
ctx = pygpgme_unwrap_gpgme_ctx_t(wrapped); ctx = _pyme_unwrap_gpgme_ctx_t(wrapped);
Py_DECREF(wrapped); Py_DECREF(wrapped);
if (ctx == NULL) if (ctx == NULL)
{ {
@ -634,14 +634,14 @@ pygpgme_set_status_cb(PyObject *self, PyObject *cb) {
} }
/* Edit callbacks. */ /* Edit callbacks. */
gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status, gpgme_error_t _pyme_edit_cb(void *opaque, gpgme_status_code_t status,
const char *args, int fd) { const char *args, int fd) {
PyObject *func = NULL, *dataarg = NULL, *pyargs = NULL, *retval = NULL; PyObject *func = NULL, *dataarg = NULL, *pyargs = NULL, *retval = NULL;
PyObject *pyopaque = (PyObject *) opaque; PyObject *pyopaque = (PyObject *) opaque;
gpgme_error_t err_status = 0; gpgme_error_t err_status = 0;
PyObject *self = NULL; PyObject *self = NULL;
pygpgme_exception_init(); _pyme_exception_init();
assert (PyTuple_Check(pyopaque)); assert (PyTuple_Check(pyopaque));
assert (PyTuple_Size(pyopaque) == 2 || PyTuple_Size(pyopaque) == 3); assert (PyTuple_Size(pyopaque) == 2 || PyTuple_Size(pyopaque) == 3);
@ -664,7 +664,7 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
retval = PyObject_CallObject(func, pyargs); retval = PyObject_CallObject(func, pyargs);
Py_DECREF(pyargs); Py_DECREF(pyargs);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
err_status = pygpgme_exception2code(); err_status = _pyme_exception2code();
} else { } else {
if (fd>=0 && retval && PyUnicode_Check(retval)) { if (fd>=0 && retval && PyUnicode_Check(retval)) {
const char *buffer; const char *buffer;
@ -673,16 +673,16 @@ gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status,
buffer = PyUnicode_AsUTF8AndSize(retval, &size); buffer = PyUnicode_AsUTF8AndSize(retval, &size);
if (write(fd, buffer, size) < 0) { if (write(fd, buffer, size) < 0) {
err_status = gpgme_error_from_syserror (); err_status = gpgme_error_from_syserror ();
pygpgme_raise_exception (err_status); _pyme_raise_exception (err_status);
} }
if (! err_status && write(fd, "\n", 1) < 0) { if (! err_status && write(fd, "\n", 1) < 0) {
err_status = gpgme_error_from_syserror (); err_status = gpgme_error_from_syserror ();
pygpgme_raise_exception (err_status); _pyme_raise_exception (err_status);
} }
} }
} }
if (err_status) if (err_status)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
Py_XDECREF(retval); Py_XDECREF(retval);
return err_status; return err_status;
@ -724,7 +724,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
retval = PyObject_CallObject(func, pyargs); retval = PyObject_CallObject(func, pyargs);
Py_DECREF(pyargs); Py_DECREF(pyargs);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -733,7 +733,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"expected bytes from read callback, got %s", "expected bytes from read callback, got %s",
retval->ob_type->tp_name); retval->ob_type->tp_name);
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -742,7 +742,7 @@ static ssize_t pyDataReadCb(void *hook, void *buffer, size_t size)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"expected %zu bytes from read callback, got %zu", "expected %zu bytes from read callback, got %zu",
size, PyBytes_Size(retval)); size, PyBytes_Size(retval));
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -789,7 +789,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
retval = PyObject_CallObject(func, pyargs); retval = PyObject_CallObject(func, pyargs);
Py_DECREF(pyargs); Py_DECREF(pyargs);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -798,7 +798,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"expected int from read callback, got %s", "expected int from read callback, got %s",
retval->ob_type->tp_name); retval->ob_type->tp_name);
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -850,7 +850,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence)
retval = PyObject_CallObject(func, pyargs); retval = PyObject_CallObject(func, pyargs);
Py_DECREF(pyargs); Py_DECREF(pyargs);
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -859,7 +859,7 @@ static off_t pyDataSeekCb(void *hook, off_t offset, int whence)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"expected int from read callback, got %s", "expected int from read callback, got %s",
retval->ob_type->tp_name); retval->ob_type->tp_name);
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
result = -1; result = -1;
goto leave; goto leave;
} }
@ -906,7 +906,7 @@ static void pyDataReleaseCb(void *hook)
Py_XDECREF(retval); Py_XDECREF(retval);
Py_DECREF(pyargs); Py_DECREF(pyargs);
if (PyErr_Occurred()) if (PyErr_Occurred())
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
} }
PyObject * PyObject *
@ -930,7 +930,7 @@ pygpgme_data_new_from_cbs(PyObject *self,
err = gpgme_data_new_from_cbs(r_data, &cbs, (void *) pycbs); err = gpgme_data_new_from_cbs(r_data, &cbs, (void *) pycbs);
if (err) if (err)
return pygpgme_raise_exception(err); return _pyme_raise_exception(err);
PyObject_SetAttrString(self, "_data_cbs", pycbs); PyObject_SetAttrString(self, "_data_cbs", pycbs);
@ -964,13 +964,13 @@ _pyme_assuan_data_cb (void *hook, const void *data, size_t datalen)
retval = PyObject_CallFunctionObjArgs(func, py_data, NULL); retval = PyObject_CallFunctionObjArgs(func, py_data, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = pygpgme_exception2code(); err = _pyme_exception2code();
Py_DECREF(py_data); Py_DECREF(py_data);
Py_XDECREF(retval); Py_XDECREF(retval);
leave: leave:
if (err) if (err)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;
} }
@ -1002,7 +1002,7 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL); retval = PyObject_CallFunctionObjArgs(func, py_name, py_args, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = pygpgme_exception2code(); err = _pyme_exception2code();
Py_DECREF(py_name); Py_DECREF(py_name);
Py_DECREF(py_args); Py_DECREF(py_args);
Py_XDECREF(retval); Py_XDECREF(retval);
@ -1012,7 +1012,7 @@ _pyme_assuan_inquire_cb (void *hook, const char *name, const char *args,
leave: leave:
if (err) if (err)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;
} }
@ -1043,13 +1043,13 @@ _pyme_assuan_status_cb (void *hook, const char *status, const char *args)
retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL); retval = PyObject_CallFunctionObjArgs(func, py_status, py_args, NULL);
if (PyErr_Occurred()) if (PyErr_Occurred())
err = pygpgme_exception2code(); err = _pyme_exception2code();
Py_DECREF(py_status); Py_DECREF(py_status);
Py_DECREF(py_args); Py_DECREF(py_args);
Py_XDECREF(retval); Py_XDECREF(retval);
leave: leave:
if (err) if (err)
pygpgme_stash_callback_exception(self); _pyme_stash_callback_exception(self);
return err; return err;
} }

4
lang/python/helpers.h
View File

@ -34,7 +34,3 @@ PyObject *pygpgme_set_status_cb(PyObject *self, PyObject *cb);
PyObject *pygpgme_data_new_from_cbs(PyObject *self, PyObject *pycbs, PyObject *pygpgme_data_new_from_cbs(PyObject *self, PyObject *pycbs,
gpgme_data_t *r_data); gpgme_data_t *r_data);
/* SWIG support for helpers.c */
PyObject *pygpgme_wrap_gpgme_data_t(gpgme_data_t data);
gpgme_ctx_t pygpgme_unwrap_gpgme_ctx_t(PyObject *wrapped);

23
lang/python/private.h
View File

@ -22,18 +22,20 @@
#ifndef _PYME_PRIVATE_H_ #ifndef _PYME_PRIVATE_H_
#define _PYME_PRIVATE_H_ #define _PYME_PRIVATE_H_
void pygpgme_exception_init(void); /* GPGME glue. Implemented in helpers.c. */
gpgme_error_t pygpgme_exception2code(void);
PyObject *object_to_gpgme_t(PyObject *input, const char *objtype, int argnum); void _pyme_exception_init(void);
PyObject *object_to_gpgme_data_t(PyObject *input, int argnum, gpgme_error_t _pyme_exception2code(void);
PyObject *_pyme_obj2gpgme_t(PyObject *input, const char *objtype, int argnum);
PyObject *_pyme_obj2gpgme_data_t(PyObject *input, int argnum,
gpgme_data_t *wrapper, gpgme_data_t *wrapper,
PyObject **bytesio, Py_buffer *view); PyObject **bytesio, Py_buffer *view);
PyObject *pygpgme_wrap_fragile_result(PyObject *fragile, const char *classname); PyObject *_pyme_wrap_result(PyObject *fragile, const char *classname);
gpgme_error_t pyEditCb(void *opaque, gpgme_status_code_t status, gpgme_error_t _pyme_edit_cb(void *opaque, gpgme_status_code_t status,
const char *args, int fd); const char *args, int fd);
gpgme_error_t _pyme_assuan_data_cb (void *hook, gpgme_error_t _pyme_assuan_data_cb (void *hook,
const void *data, size_t datalen); const void *data, size_t datalen);
@ -43,4 +45,11 @@ gpgme_error_t _pyme_assuan_inquire_cb (void *hook,
gpgme_error_t _pyme_assuan_status_cb (void *hook, gpgme_error_t _pyme_assuan_status_cb (void *hook,
const char *status, const char *args); const char *status, const char *args);
/* SWIG runtime support. Implemented in gpgme.i. */
PyObject *_pyme_wrap_gpgme_data_t(gpgme_data_t data);
gpgme_ctx_t _pyme_unwrap_gpgme_ctx_t(PyObject *wrapped);
#endif /* _PYME_PRIVATE_H_ */ #endif /* _PYME_PRIVATE_H_ */