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

python: Improve build system integration, fix warnings.

Browse Source 
* lang/python/Makefile.am: Pass CFLAGS to python build system.
* lang/python/helpers.c (pyPassphraseCb): Use correct type for length.
(pygpgme_data_new_from_cbs): Drop unused variable.

Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
Justus Winter 2016-06-01 14:16:27 +02:00
parent 54314a9c7d
commit 73c47535b6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/python/Makefile.am
View File

@ -40,7 +40,7 @@ gpgme_wrap.c pyme/pygpgme.py: gpgme.i errors.i gpgme.h copystamp
$< $<
all-local: gpgme_wrap.c pyme/pygpgme.py copystamp all-local: gpgme_wrap.c pyme/pygpgme.py copystamp
$(PYTHON) $(srcdir)/setup.py build --verbose CFLAGS="$(CFLAGS)" $(PYTHON) $(srcdir)/setup.py build --verbose
clean-local: clean-local:
rm -rf -- build gpgme.h errors.i gpgme_wrap.c pyme/pygpgme.py \ rm -rf -- build gpgme.h errors.i gpgme_wrap.c pyme/pygpgme.py \

8
lang/python/helpers.c
View File

@ -207,7 +207,12 @@ static gpgme_error_t pyPassphraseCb(void *hook,
if (PyBytes_Check(retval)) if (PyBytes_Check(retval))
buf = PyBytes_AsString(retval), len = PyBytes_Size(retval); buf = PyBytes_AsString(retval), len = PyBytes_Size(retval);
else if (PyUnicode_Check(retval)) else if (PyUnicode_Check(retval))
buf = PyUnicode_AsUTF8AndSize(retval, &len); {
Py_ssize_t ssize;
buf = PyUnicode_AsUTF8AndSize(retval, &ssize);
assert (! buf || ssize >= 0);
len = (size_t) ssize;
}
else else
{ {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
@ -634,7 +639,6 @@ gpgme_error_t pygpgme_data_new_from_cbs(gpgme_data_t *r_data,
pyDataSeekCb, pyDataSeekCb,
pyDataReleaseCb, pyDataReleaseCb,
}; };
PyObject *dataarg = NULL;
assert (PyTuple_Check(pycbs)); assert (PyTuple_Check(pycbs));
assert (PyTuple_Size(pycbs) == 5 || PyTuple_Size(pycbs) == 6); assert (PyTuple_Size(pycbs) == 5 || PyTuple_Size(pycbs) == 6);