projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
32ebff6
)
python: Fixed more unicode related problems.
author
Sven Trenkel
<collectd@semidefinite.de>
Fri, 1 Jan 2010 16:03:04 +0000
(17:03 +0100)
committer
Florian Forster
<octo@noris.net>
Tue, 5 Jan 2010 10:02:51 +0000
(11:02 +0100)
src/python.c
patch
|
blob
|
history
diff --git
a/src/python.c
b/src/python.c
index
824aa25
..
25681b6
100644
(file)
--- a/
src/python.c
+++ b/
src/python.c
@@
-420,13
+420,14
@@
static int cpy_notification_callback(const notification_t *notification, user_da
static void cpy_log_callback(int severity, const char *message, user_data_t *data) {
cpy_callback_t * c = data->data;
static void cpy_log_callback(int severity, const char *message, user_data_t *data) {
cpy_callback_t * c = data->data;
- PyObject *ret;
+ PyObject *ret
, *text
;
CPY_LOCK_THREADS
CPY_LOCK_THREADS
+ text = cpy_string_to_unicode_or_bytes(message);
if (c->data == NULL)
if (c->data == NULL)
- ret = PyObject_CallFunction(c->callback, "i
s", severity, message
); /* New reference. */
+ ret = PyObject_CallFunction(c->callback, "i
N", severity, text
); /* New reference. */
else
else
- ret = PyObject_CallFunction(c->callback, "i
sO", severity, message
, c->data); /* New reference. */
+ ret = PyObject_CallFunction(c->callback, "i
NO", severity, text
, c->data); /* New reference. */
if (ret == NULL) {
/* FIXME */
if (ret == NULL) {
/* FIXME */
@@
-443,13
+444,14
@@
static void cpy_log_callback(int severity, const char *message, user_data_t *dat
static void cpy_flush_callback(int timeout, const char *id, user_data_t *data) {
cpy_callback_t * c = data->data;
static void cpy_flush_callback(int timeout, const char *id, user_data_t *data) {
cpy_callback_t * c = data->data;
- PyObject *ret;
+ PyObject *ret
, *text
;
CPY_LOCK_THREADS
CPY_LOCK_THREADS
+ text = cpy_string_to_unicode_or_bytes(id);
if (c->data == NULL)
if (c->data == NULL)
- ret = PyObject_CallFunction(c->callback, "i
s", timeout, id
); /* New reference. */
+ ret = PyObject_CallFunction(c->callback, "i
N", timeout, text
); /* New reference. */
else
else
- ret = PyObject_CallFunction(c->callback, "i
sO", timeout, id
, c->data); /* New reference. */
+ ret = PyObject_CallFunction(c->callback, "i
NO", timeout, text
, c->data); /* New reference. */
if (ret == NULL) {
cpy_log_exception("flush callback");
if (ret == NULL) {
cpy_log_exception("flush callback");
@@
-879,7
+881,8
@@
static PyObject *cpy_oconfig_to_pyconfig(oconfig_item_t *ci, PyObject *parent) {
}
}
}
}
- item = PyObject_CallFunction((void *) &ConfigType, "sONO", ci->key, parent, values, Py_None);
+ tmp = cpy_string_to_unicode_or_bytes(ci->key);
+ item = PyObject_CallFunction((void *) &ConfigType, "NONO", tmp, parent, values, Py_None);
if (item == NULL)
return NULL;
children = PyTuple_New(ci->children_num); /* New reference. */
if (item == NULL)
return NULL;
children = PyTuple_New(ci->children_num); /* New reference. */
@@
-895,7
+898,7
@@
static PyObject *cpy_oconfig_to_pyconfig(oconfig_item_t *ci, PyObject *parent) {
static struct PyModuleDef collectdmodule = {
PyModuleDef_HEAD_INIT,
"collectd", /* name of module */
static struct PyModuleDef collectdmodule = {
PyModuleDef_HEAD_INIT,
"collectd", /* name of module */
- "
Where does this go?
", /* module documentation, may be NULL */
+ "
The python interface to collectd
", /* module documentation, may be NULL */
-1,
cpy_methods
};
-1,
cpy_methods
};