systemd-python: some python3 and bug fixes

[elogind.git] / src / python-systemd / _reader.c

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 69c6d02a9ef3491250e6a233cc281c1788a5cf94..ae3d77cfe9ef2fdc678d010ebd1e903dffd11f0f 100644 (file)
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 typedef struct {
     PyObject_HEAD
     sd_journal *j;
 typedef struct {
     PyObject_HEAD
     sd_journal *j;

-    PyObject *default_call;
-    PyObject *call_dict;

 } Journal;
 static PyTypeObject JournalType;
 
 } Journal;
 static PyTypeObject JournalType;
 


@@ -34,27 +32,11 @@ static void
 Journal_dealloc(Journal* self)
 {
     sd_journal_close(self->j);
 Journal_dealloc(Journal* self)
 {
     sd_journal_close(self->j);

-    Py_XDECREF(self->default_call);
-    Py_XDECREF(self->call_dict);

     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 

-static PyObject *
-Journal_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    Journal *self;
-
-    self = (Journal *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->call_dict = PyDict_New();
-        self->default_call = Py_None;
-    }
-
-    return (PyObject *) self;
-}
-

 PyDoc_STRVAR(Journal__doc__,
 PyDoc_STRVAR(Journal__doc__,

-"Journal([flags][, default_call][, call_dict][,path]) -> ...\n"
+"Journal([flags][,path]) -> ...\n"

 "Journal instance\n\n"
 "Returns instance of Journal, which allows filtering and return\n"
 "of journal entries.\n"
 "Journal instance\n\n"
 "Returns instance of Journal, which allows filtering and return\n"
 "of journal entries.\n"


@@ -63,13 +45,6 @@ PyDoc_STRVAR(Journal__doc__,
 "journal on local machine only; RUNTIME_ONLY opens only\n"
 "volatile journal files; and SYSTEM_ONLY opens only\n"
 "journal files of system services and the kernel.\n"
 "journal on local machine only; RUNTIME_ONLY opens only\n"
 "volatile journal files; and SYSTEM_ONLY opens only\n"
 "journal files of system services and the kernel.\n"

-"Argument `default_call` must be a callable that accepts one\n"
-"argument which is string/bytes value of a field and returns\n"
-"python object.\n"
-"Argument `call_dict` is a dictionary where the key represents\n"
-"a field name, and value is a callable as per `default_call`.\n"
-"A set of sane defaults for `default_call` and `call_dict` are\n"
-"present.\n"

 "Argument `path` is the directory of journal files. Note that\n"
 "currently flags are ignored when `path` is present as they are\n"
 " not relevant.");
 "Argument `path` is the directory of journal files. Note that\n"
 "currently flags are ignored when `path` is present as they are\n"
 " not relevant.");


@@ -78,38 +53,12 @@ Journal_init(Journal *self, PyObject *args, PyObject *keywds)
 {
     int flags=SD_JOURNAL_LOCAL_ONLY;
     char *path=NULL;
 {
     int flags=SD_JOURNAL_LOCAL_ONLY;
     char *path=NULL;

-    PyObject *default_call=NULL, *call_dict=NULL;

 
 

-    static char *kwlist[] = {"flags", "default_call", "call_dict", "path", NULL};
-    if (! PyArg_ParseTupleAndKeywords(args, keywds, "|iOOs", kwlist,
-                                      &flags, &default_call, &call_dict, &path))
+    static char *kwlist[] = {"flags", NULL};
+    if (! PyArg_ParseTupleAndKeywords(args, keywds, "|is", kwlist,
+                                      &flags, &path))

         return 1;
 
         return 1;
 

-    if (default_call) {
-        if (PyCallable_Check(default_call) || default_call == Py_None) {
-            Py_DECREF(self->default_call);
-            self->default_call = default_call;
-            Py_INCREF(self->default_call);
-        }else{
-            PyErr_SetString(PyExc_TypeError, "Default call not callable");
-            return 1;
-        }
-    }
-
-    if (call_dict) {
-        if (PyDict_Check(call_dict)) {
-            Py_DECREF(self->call_dict);
-            self->call_dict = call_dict;
-            Py_INCREF(self->call_dict);
-        }else if (call_dict == Py_None) {
-            Py_DECREF(self->call_dict);
-            self->call_dict = PyDict_New();
-        }else{
-            PyErr_SetString(PyExc_TypeError, "Call dictionary must be dict type");
-            return 1;
-        }
-    }
-

     int r;
     if (path) {
         r = sd_journal_open_directory(&self->j, path, 0);
     int r;
     if (path) {
         r = sd_journal_open_directory(&self->j, path, 0);


@@ -132,42 +81,6 @@ Journal_init(Journal *self, PyObject *args, PyObject *keywds)
     return 0;
 }
 
     return 0;
 }
 

-static PyObject *
-Journal___process_field(Journal *self, PyObject *key, const void *value, ssize_t value_len)
-{
-    PyObject *callable=NULL, *return_value=NULL;
-    if (PyDict_Check(self->call_dict))
-        callable = PyDict_GetItem(self->call_dict, key);
-
-    if (PyCallable_Check(callable)) {
-#if PY_MAJOR_VERSION >=3
-        return_value = PyObject_CallFunction(callable, "y#", value, value_len);
-#else
-        return_value = PyObject_CallFunction(callable, "s#", value, value_len);
-#endif
-        if (!return_value)
-            PyErr_Clear();
-    }
-    if (!return_value && PyCallable_Check(self->default_call))
-#if PY_MAJOR_VERSION >=3
-        return_value = PyObject_CallFunction(self->default_call, "y#", value, value_len);
-#else
-        return_value = PyObject_CallFunction(self->default_call, "s#", value, value_len);
-#endif
-    if (!return_value) {
-        PyErr_Clear();
-#if PY_MAJOR_VERSION >=3
-        return_value = PyBytes_FromStringAndSize(value, value_len);
-#else
-        return_value = PyString_FromStringAndSize(value, value_len);
-#endif
-    }
-    if (!return_value) {
-        return_value = Py_None;
-    }
-    return return_value;
-}
-

 PyDoc_STRVAR(Journal_get_next__doc__,
 "get_next([skip]) -> dict\n\n"
 "Return dictionary of the next log entry. Optional skip value will\n"
 PyDoc_STRVAR(Journal_get_next__doc__,
 "get_next([skip]) -> dict\n\n"
 "Return dictionary of the next log entry. Optional skip value will\n"


@@ -223,10 +136,10 @@ Journal_get_next(Journal *self, PyObject *args)
 #else
         key = PyString_FromStringAndSize(msg, delim_ptr - (const char*) msg);
 #endif
 #else
         key = PyString_FromStringAndSize(msg, delim_ptr - (const char*) msg);
 #endif

-        value = Journal___process_field(self, key, delim_ptr + 1, (const char*) msg + msg_len - (delim_ptr + 1) );
+        value = PyBytes_FromStringAndSize(delim_ptr + 1, (const char*) msg + msg_len - (delim_ptr + 1) );

         if (PyDict_Contains(dict, key)) {
             cur_value = PyDict_GetItem(dict, key);
         if (PyDict_Contains(dict, key)) {
             cur_value = PyDict_GetItem(dict, key);

-            if (PyList_CheckExact(cur_value) && PyList_Size(cur_value) > 1) {
+            if (PyList_CheckExact(cur_value)) {

                 PyList_Append(cur_value, value);
             }else{
                 tmp_list = PyList_New(0);
                 PyList_Append(cur_value, value);
             }else{
                 tmp_list = PyList_New(0);


@@ -252,7 +165,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #else
         key = PyString_FromString("__REALTIME_TIMESTAMP");
 #endif
 #else
         key = PyString_FromString("__REALTIME_TIMESTAMP");
 #endif

-        value = Journal___process_field(self, key, realtime_str, strlen(realtime_str));
+        value = PyBytes_FromString(realtime_str);

         PyDict_SetItem(dict, key, value);
         Py_DECREF(key);
         Py_DECREF(value);
         PyDict_SetItem(dict, key, value);
         Py_DECREF(key);
         Py_DECREF(value);


@@ -268,7 +181,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #else
         key = PyString_FromString("__MONOTONIC_TIMESTAMP");
 #endif
 #else
         key = PyString_FromString("__MONOTONIC_TIMESTAMP");
 #endif

-        value = Journal___process_field(self, key, monotonic_str, strlen(monotonic_str));
+        value = PyBytes_FromString(monotonic_str);

 
         PyDict_SetItem(dict, key, value);
         Py_DECREF(key);
 
         PyDict_SetItem(dict, key, value);
         Py_DECREF(key);


@@ -282,7 +195,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #else
         key = PyString_FromString("__CURSOR");
 #endif
 #else
         key = PyString_FromString("__CURSOR");
 #endif

-        value = Journal___process_field(self, key, cursor, strlen(cursor));
+        value = PyBytes_FromString(cursor);

         PyDict_SetItem(dict, key, value);
         free(cursor);
         Py_DECREF(key);
         PyDict_SetItem(dict, key, value);
         free(cursor);
         Py_DECREF(key);


@@ -303,11 +216,7 @@ Journal_get_previous(Journal *self, PyObject *args)
     if (! PyArg_ParseTuple(args, "|L", &skip))
         return NULL;
 
     if (! PyArg_ParseTuple(args, "|L", &skip))
         return NULL;
 

-    PyObject *dict, *arg;
-    arg = Py_BuildValue("(L)", -skip);
-    dict = Journal_get_next(self, arg);
-    Py_DECREF(arg);
-    return dict;
+    return PyObject_CallMethod((PyObject *)self, "get_next", "L", -skip);

 }
 
 PyDoc_STRVAR(Journal_add_match__doc__,
 }
 
 PyDoc_STRVAR(Journal_add_match__doc__,


@@ -474,7 +383,7 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
                                       &offset, &whence))
         return NULL;
 
                                       &offset, &whence))
         return NULL;
 

-    PyObject *arg;
+    PyObject *result=NULL;

     if (whence == SEEK_SET){
         int r;
         Py_BEGIN_ALLOW_THREADS
     if (whence == SEEK_SET){
         int r;
         Py_BEGIN_ALLOW_THREADS


@@ -485,14 +394,10 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
             return NULL;
         }
         if (offset > 0LL) {
             return NULL;
         }
         if (offset > 0LL) {

-            arg = Py_BuildValue("(L)", offset);
-            Py_DECREF(Journal_get_next(self, arg));
-            Py_DECREF(arg);
+            result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);

         }
     }else if (whence == SEEK_CUR){
         }
     }else if (whence == SEEK_CUR){

-        arg = Py_BuildValue("(L)", offset);
-        Py_DECREF(Journal_get_next(self, arg));
-        Py_DECREF(arg);
+        result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);

     }else if (whence == SEEK_END){
         int r;
         Py_BEGIN_ALLOW_THREADS
     }else if (whence == SEEK_END){
         int r;
         Py_BEGIN_ALLOW_THREADS


@@ -502,18 +407,19 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
             PyErr_SetString(PyExc_RuntimeError, "Error seeking to tail");
             return NULL;
         }
             PyErr_SetString(PyExc_RuntimeError, "Error seeking to tail");
             return NULL;
         }

-        arg = Py_BuildValue("(L)", -1LL);
-        Py_DECREF(Journal_get_next(self, arg));
-        Py_DECREF(arg);

         if (offset < 0LL) {
         if (offset < 0LL) {

-            arg = Py_BuildValue("(L)", offset);
-            Py_DECREF(Journal_get_next(self, arg));
-            Py_DECREF(arg);
+            result = PyObject_CallMethod((PyObject *)self, "get_next", "L", offset);
+        }else{
+            result = PyObject_CallMethod((PyObject *)self, "get_next", "L", -1LL);

         }
     }else{
         PyErr_SetString(PyExc_ValueError, "Invalid value for whence");
         }
     }else{
         PyErr_SetString(PyExc_ValueError, "Invalid value for whence");

-        return NULL;

     }
     }

+
+    if (result)
+        Py_DECREF(result);
+    if (PyErr_Occurred())
+        return NULL;

     Py_RETURN_NONE;
 }
 
     Py_RETURN_NONE;
 }
 


@@ -706,13 +612,10 @@ Journal_iter(PyObject *self)
 static PyObject *
 Journal_iternext(PyObject *self)
 {
 static PyObject *
 Journal_iternext(PyObject *self)
 {

-    Journal *iter = (Journal *)self;
-    PyObject *dict, *arg;
+    PyObject *dict;

     Py_ssize_t dict_size;
 
     Py_ssize_t dict_size;
 

-    arg =  Py_BuildValue("()");
-    dict = Journal_get_next(iter, arg);
-    Py_DECREF(arg);
+    dict = PyObject_CallMethod(self, "get_next", "");

     dict_size = PyDict_Size(dict);
     if ((int64_t) dict_size > 0LL) {
         return dict;
     dict_size = PyDict_Size(dict);
     if ((int64_t) dict_size > 0LL) {
         return dict;


@@ -764,7 +667,7 @@ Journal_query_unique(Journal *self, PyObject *args)
 
     SD_JOURNAL_FOREACH_UNIQUE(self->j, uniq, uniq_len) {
         delim_ptr = memchr(uniq, '=', uniq_len);
 
     SD_JOURNAL_FOREACH_UNIQUE(self->j, uniq, uniq_len) {
         delim_ptr = memchr(uniq, '=', uniq_len);

-        value = Journal___process_field(self, key, delim_ptr + 1, (const char*) uniq + uniq_len - (delim_ptr + 1));
+        value = PyBytes_FromStringAndSize(delim_ptr + 1, (const char*) uniq + uniq_len - (delim_ptr + 1));

         PySet_Add(value_set, value);
         Py_DECREF(value);
     }
         PySet_Add(value_set, value);
         Py_DECREF(value);
     }


@@ -773,150 +676,6 @@ Journal_query_unique(Journal *self, PyObject *args)
 }
 #endif //def SD_JOURNAL_FOREACH_UNIQUE
 
 }
 #endif //def SD_JOURNAL_FOREACH_UNIQUE
 

-PyDoc_STRVAR(Journal_log_level__doc__,
-"log_level(level) -> None\n\n"
-"Sets maximum log level by setting matches for PRIORITY.");
-static PyObject *
-Journal_log_level(Journal *self, PyObject *args)
-{
-    int level;
-    if (! PyArg_ParseTuple(args, "i", &level))
-        return NULL;
-
-    if (level < 0 || level > 7) {
-        PyErr_SetString(PyExc_ValueError, "Log level should be 0 <= level <= 7");
-        return NULL;
-    }
-    int i;
-    char level_str[2];
-    PyObject *arg, *keywds;
-    for(i = 0; i <= level; i++) {
-        sprintf(level_str, "%i", i);
-        arg = PyTuple_New(0);
-        keywds = Py_BuildValue("{s:s}", "PRIORITY", level_str);
-        Journal_add_match(self, arg, keywds);
-        Py_DECREF(arg);
-        Py_DECREF(keywds);
-        if (PyErr_Occurred())
-            return NULL;
-    }
-    Py_RETURN_NONE;
-}
-
-PyDoc_STRVAR(Journal_this_boot__doc__,
-"this_boot() -> None\n\n"
-"Sets match filter for the current _BOOT_ID.");
-static PyObject *
-Journal_this_boot(Journal *self, PyObject *args)
-{
-    sd_id128_t sd_id;
-    int r;
-    r = sd_id128_get_boot(&sd_id);
-    if (r == -EIO) {
-        PyErr_SetString(PyExc_IOError, "Error getting current boot ID");
-        return NULL;
-    } else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error getting current boot ID");
-        return NULL;
-    }
-
-    char bootid[33];
-    sd_id128_to_string(sd_id, bootid);
-
-    PyObject *arg, *keywds;
-    arg = PyTuple_New(0);
-    keywds = Py_BuildValue("{s:s}", "_BOOT_ID", bootid);
-    Journal_add_match(self, arg, keywds);
-    Py_DECREF(arg);
-    Py_DECREF(keywds);
-    if (PyErr_Occurred())
-        return NULL;
-
-    Py_RETURN_NONE;
-}
-
-PyDoc_STRVAR(Journal_this_machine__doc__,
-"this_machine() -> None\n\n"
-"Sets match filter for the current _MACHINE_ID.");
-static PyObject *
-Journal_this_machine(Journal *self, PyObject *args)
-{
-    sd_id128_t sd_id;
-    int r;
-    r = sd_id128_get_machine(&sd_id);
-    if (r == -EIO) {
-        PyErr_SetString(PyExc_IOError, "Error getting current boot ID");
-        return NULL;
-    } else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error getting current boot ID");
-        return NULL;
-    }
-
-    char machineid[33];
-    sd_id128_to_string(sd_id, machineid);
-
-    PyObject *arg, *keywds;
-    arg = PyTuple_New(0);
-    keywds = Py_BuildValue("{s:s}", "_MACHINE_ID", machineid);
-    Journal_add_match(self, arg, keywds);
-    Py_DECREF(arg);
-    Py_DECREF(keywds);
-    if (PyErr_Occurred())
-        return NULL;
-
-    Py_RETURN_NONE;
-}
-
-static PyObject *
-Journal_get_default_call(Journal *self, void *closure)
-{
-    Py_INCREF(self->default_call);
-    return self->default_call;
-}
-
-static int
-Journal_set_default_call(Journal *self, PyObject *value, void *closure)
-{
-    if (value == NULL) {
-        PyErr_SetString(PyExc_TypeError, "Cannot delete default_call");
-        return -1;
-    }
-    if (! PyCallable_Check(value)) {
-        PyErr_SetString(PyExc_TypeError, "default_call must be callable");
-        return -1;
-    }
-    Py_DECREF(self->default_call);
-    Py_INCREF(value);
-    self->default_call = value;
-
-    return 0;
-}
-
-static PyObject *
-Journal_get_call_dict(Journal *self, void *closure)
-{
-    Py_INCREF(self->call_dict);
-    return self->call_dict;
-}
-
-static int
-Journal_set_call_dict(Journal *self, PyObject *value, void *closure)
-{
-    if (value == NULL) {
-        PyErr_SetString(PyExc_TypeError, "Cannot delete call_dict");
-        return -1;
-    }
-    if (! PyDict_Check(value)) {
-        PyErr_SetString(PyExc_TypeError, "call_dict must be dict type");
-        return -1;
-    }
-    Py_DECREF(self->call_dict);
-    Py_INCREF(value);
-    self->call_dict = value;
-
-    return 0;
-}
-

 static PyObject *
 Journal_get_data_threshold(Journal *self, void *closure)
 {
 static PyObject *
 Journal_get_data_threshold(Journal *self, void *closure)
 {


@@ -972,16 +731,6 @@ static PyGetSetDef Journal_getseters[] = {
     (setter)Journal_set_data_threshold,
     "data threshold",
     NULL},
     (setter)Journal_set_data_threshold,
     "data threshold",
     NULL},

-    {"call_dict",
-    (getter)Journal_get_call_dict,
-    (setter)Journal_set_call_dict,
-    "dictionary of calls for each field",
-    NULL},
-    {"default_call",
-    (getter)Journal_get_default_call,
-    (setter)Journal_set_default_call,
-    "default call for values for fields",
-    NULL},

     {NULL}
 };
 
     {NULL}
 };
 


@@ -1010,12 +759,6 @@ static PyMethodDef Journal_methods[] = {
     {"query_unique", (PyCFunction)Journal_query_unique, METH_VARARGS,
     Journal_query_unique__doc__},
 #endif
     {"query_unique", (PyCFunction)Journal_query_unique, METH_VARARGS,
     Journal_query_unique__doc__},
 #endif

-    {"log_level", (PyCFunction)Journal_log_level, METH_VARARGS,
-    Journal_log_level__doc__},
-    {"this_boot", (PyCFunction)Journal_this_boot, METH_NOARGS,
-    Journal_this_boot__doc__},
-    {"this_machine", (PyCFunction)Journal_this_machine, METH_NOARGS,
-    Journal_this_machine__doc__},

     {NULL}  /* Sentinel */
 };
 
     {NULL}  /* Sentinel */
 };
 


@@ -1057,7 +800,7 @@ static PyTypeObject JournalType = {
     0,                                /* tp_dictoffset */
     (initproc)Journal_init,           /* tp_init */
     0,                                /* tp_alloc */
     0,                                /* tp_dictoffset */
     (initproc)Journal_init,           /* tp_init */
     0,                                /* tp_alloc */

-    Journal_new,                      /* tp_new */
+    PyType_GenericNew,                /* tp_new */

 };
 
 #if PY_MAJOR_VERSION >= 3
 };
 
 #if PY_MAJOR_VERSION >= 3