X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fpython-systemd%2F_reader.c;h=d2f738b9c7d0f0a14780050671248a3d5bf6c94e;hb=a49f4d17bfc50c5864b992e2410a41f96286afc1;hp=69c6d02a9ef3491250e6a233cc281c1788a5cf94;hpb=2d0603bd976978a62165c79129fc3a1f8d36b9e6;p=elogind.git

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 69c6d02a9..d2f738b9c 100644
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -1,21 +1,23 @@
-/*
-_reader - Python module that reads systemd journal similar to journalctl
-Copyright (C) 2012  Steven Hiscocks
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2013 Steven Hiscocks, Zbigniew Jędrzejewski-Szmek
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 #include <systemd/sd-journal.h>
 
 #include <Python.h>
@@ -25,8 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 typedef struct {
     PyObject_HEAD
     sd_journal *j;
-    PyObject *default_call;
-    PyObject *call_dict;
 } Journal;
 static PyTypeObject JournalType;
 
@@ -34,27 +34,11 @@ static void
 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);
 }
 
-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__,
-"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"
@@ -63,13 +47,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"
-"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.");
@@ -78,96 +55,32 @@ Journal_init(Journal *self, PyObject *args, PyObject *keywds)
 {
     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", "path", NULL};
+    if (! PyArg_ParseTupleAndKeywords(args, keywds, "|is", kwlist,
+                                      &flags, &path))
         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;
+    Py_BEGIN_ALLOW_THREADS
     if (path) {
         r = sd_journal_open_directory(&self->j, path, 0);
     }else{
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_open(&self->j, flags);
-        Py_END_ALLOW_THREADS
     }
-    if (r == -EINVAL) {
-        PyErr_SetString(PyExc_ValueError, "Invalid flags or path");
+    Py_END_ALLOW_THREADS
+    if (r < 0) {
+        errno = -r;
+        PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
+                            r == -ENOMEM ? PyExc_MemoryError :
+                            PyExc_OSError;
+        PyErr_SetFromErrnoWithFilename(errtype, path);
         return -1;
-    }else if (r == -ENOMEM) {
-        PyErr_SetString(PyExc_MemoryError, "Not enough memory");
-        return 1;
-    }else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error opening journal");
-        return 1;
     }
 
     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"
@@ -179,30 +92,27 @@ Journal_get_next(Journal *self, PyObject *args)
     if (! PyArg_ParseTuple(args, "|L", &skip))
         return NULL;
 
+    if (skip == 0LL) {
+        PyErr_SetString(PyExc_ValueError, "Skip number must positive/negative integer");
+        return NULL;
+    }
+
     int r;
+    Py_BEGIN_ALLOW_THREADS
     if (skip == 1LL) {
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_next(self->j);
-        Py_END_ALLOW_THREADS
     }else if (skip == -1LL) {
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_previous(self->j);
-        Py_END_ALLOW_THREADS
     }else if (skip > 1LL) {
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_next_skip(self->j, skip);
-        Py_END_ALLOW_THREADS
     }else if (skip < -1LL) {
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_previous_skip(self->j, -skip);
-        Py_END_ALLOW_THREADS
-    }else{
-        PyErr_SetString(PyExc_ValueError, "Skip number must positive/negative integer");
-        return NULL;
     }
+    Py_END_ALLOW_THREADS
 
     if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error getting next message");
+        errno = -r;
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }else if ( r == 0) { //EOF
         return PyDict_New();
@@ -223,10 +133,10 @@ Journal_get_next(Journal *self, PyObject *args)
 #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 (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);
@@ -252,7 +162,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #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);
@@ -268,7 +178,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #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);
@@ -282,7 +192,7 @@ Journal_get_next(Journal *self, PyObject *args)
 #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);
@@ -303,11 +213,7 @@ Journal_get_previous(Journal *self, PyObject *args)
     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__,
@@ -347,14 +253,12 @@ Journal_add_match(Journal *self, PyObject *args, PyObject *keywds)
         if (PyErr_Occurred())
             return NULL;
         r = sd_journal_add_match(self->j, arg_match, arg_match_len);
-        if (r == -EINVAL) {
-            PyErr_SetString(PyExc_ValueError, "Invalid match");
-            return NULL;
-        }else if (r == -ENOMEM) {
-            PyErr_SetString(PyExc_MemoryError, "Not enough memory");
-            return NULL;
-        }else if (r < 0) {
-            PyErr_SetString(PyExc_RuntimeError, "Error adding match");
+        if (r < 0) {
+            errno = -r;
+            PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
+                                r == -ENOMEM ? PyExc_MemoryError :
+                                PyExc_OSError;
+            PyErr_SetFromErrno(errtype);
             return NULL;
         }
     }
@@ -436,11 +340,11 @@ Journal_add_disjunction(Journal *self, PyObject *args)
 {
     int r;
     r = sd_journal_add_disjunction(self->j);
-    if (r == -ENOMEM) {
-        PyErr_SetString(PyExc_MemoryError, "Not enough memory");
-        return NULL;
-    }else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error adding disjunction");
+    if (r < 0) {
+        errno = -r;
+        PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
+                            PyExc_OSError;
+        PyErr_SetFromErrno(errtype);
         return NULL;
     }
     Py_RETURN_NONE;
@@ -474,46 +378,45 @@ Journal_seek(Journal *self, PyObject *args, PyObject *keywds)
                                       &offset, &whence))
         return NULL;
 
-    PyObject *arg;
+    PyObject *result=NULL;
     if (whence == SEEK_SET){
         int r;
         Py_BEGIN_ALLOW_THREADS
         r = sd_journal_seek_head(self->j);
         Py_END_ALLOW_THREADS
         if (r < 0) {
-            PyErr_SetString(PyExc_RuntimeError, "Error seeking to head");
+            errno = -r;
+            PyErr_SetFromErrno(PyExc_OSError);
             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){
-        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
         r = sd_journal_seek_tail(self->j);
         Py_END_ALLOW_THREADS
         if (r < 0) {
-            PyErr_SetString(PyExc_RuntimeError, "Error seeking to tail");
+            errno = -r;
+            PyErr_SetFromErrno(PyExc_OSError);
             return NULL;
         }
-        arg = Py_BuildValue("(L)", -1LL);
-        Py_DECREF(Journal_get_next(self, arg));
-        Py_DECREF(arg);
         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");
-        return NULL;
     }
+
+    if (result)
+        Py_DECREF(result);
+    if (PyErr_Occurred())
+        return NULL;
     Py_RETURN_NONE;
 }
 
@@ -525,34 +428,12 @@ PyDoc_STRVAR(Journal_seek_realtime__doc__,
 static PyObject *
 Journal_seek_realtime(Journal *self, PyObject *args)
 {
-    PyObject *arg;
-    if (! PyArg_ParseTuple(args, "O", &arg))
+    uint64_t timestamp;
+    if (! PyArg_ParseTuple(args, "K", &timestamp))
         return NULL;
 
-    uint64_t timestamp=-1LL;
-    if (PyDateTime_Check(arg)) {
-        PyObject *temp;
-        char *timestamp_str;
-        temp = PyObject_CallMethod(arg, "strftime", "s", "%s%f");
-#if PY_MAJOR_VERSION >=3
-        PyObject *temp2;
-        temp2 = PyUnicode_AsUTF8String(temp);
-        timestamp_str = PyBytes_AsString(temp2);
-        Py_DECREF(temp2);
-#else
-        timestamp_str = PyString_AsString(temp);
-#endif
-        Py_DECREF(temp);
-        timestamp = strtoull(timestamp_str, NULL, 10);
-    }else if (PyLong_Check(arg)) {
-        timestamp = PyLong_AsUnsignedLongLong(arg);
-#if PY_MAJOR_VERSION <3
-    }else if (PyInt_Check(arg)) {
-        timestamp = PyInt_AsUnsignedLongLongMask(arg);
-#endif
-    }
     if ((int64_t) timestamp < 0LL) {
-        PyErr_SetString(PyExc_ValueError, "Time must be positive integer or datetime instance");
+        PyErr_SetString(PyExc_ValueError, "Time must be positive integer");
         return NULL;
     }
 
@@ -561,7 +442,8 @@ Journal_seek_realtime(Journal *self, PyObject *args)
     r = sd_journal_seek_realtime_usec(self->j, timestamp);
     Py_END_ALLOW_THREADS
     if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error seek to time");
+        errno = -r;
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
     Py_RETURN_NONE;
@@ -577,30 +459,16 @@ PyDoc_STRVAR(Journal_seek_monotonic__doc__,
 static PyObject *
 Journal_seek_monotonic(Journal *self, PyObject *args)
 {
-    PyObject *arg;
+    double timedouble;
     char *bootid=NULL;
-    if (! PyArg_ParseTuple(args, "O|s", &arg, &bootid))
+    if (! PyArg_ParseTuple(args, "d|z", &timedouble, &bootid))
         return NULL;
 
-    uint64_t timestamp=-1LL;
-    if PyDelta_Check(arg) {
-        PyObject *temp;
-        temp = PyObject_CallMethod(arg, "total_seconds", NULL);
-        timestamp = (uint64_t) (PyFloat_AsDouble(temp) * 1E6);
-        Py_DECREF(temp);
-    }else if (PyFloat_Check(arg)) {
-        timestamp = (uint64_t) (PyFloat_AsDouble(arg) * 1E6);
-    }else if (PyLong_Check(arg)) {
-        timestamp = PyLong_AsUnsignedLongLong(arg) * (uint64_t) 1E6;
-#if PY_MAJOR_VERSION <3
-    }else if (PyInt_Check(arg)) {
-        timestamp = PyInt_AsUnsignedLongLongMask(arg) * (uint64_t) 1E6;
-#endif
-
-    }
+    uint64_t timestamp;
+    timestamp = (uint64_t) (timedouble * 1.0E6);
 
     if ((int64_t) timestamp < 0LL) {
-        PyErr_SetString(PyExc_ValueError, "Time must be positive number or timedelta instance");
+        PyErr_SetString(PyExc_ValueError, "Time must be positive number");
         return NULL;
     }
 
@@ -611,8 +479,9 @@ Journal_seek_monotonic(Journal *self, PyObject *args)
         if (r == -EINVAL) {
             PyErr_SetString(PyExc_ValueError, "Invalid bootid");
             return NULL;
-        } else if (r < 0) {
-            PyErr_SetString(PyExc_RuntimeError, "Error processing bootid");
+        }else if (r < 0) {
+            errno = -r;
+            PyErr_SetFromErrno(PyExc_OSError);
             return NULL;
         }
     }else{
@@ -620,8 +489,9 @@ Journal_seek_monotonic(Journal *self, PyObject *args)
         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");
+        }else if (r < 0) {
+            errno = -r;
+            PyErr_SetFromErrno(PyExc_OSError);
             return NULL;
         }
     }
@@ -630,7 +500,8 @@ Journal_seek_monotonic(Journal *self, PyObject *args)
     r = sd_journal_seek_monotonic_usec(self->j, sd_id, timestamp);
     Py_END_ALLOW_THREADS
     if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error seek to time");
+        errno = -r;
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
     Py_RETURN_NONE;
@@ -653,14 +524,19 @@ Journal_wait(Journal *self, PyObject *args, PyObject *keywds)
         return NULL;
 
     int r;
+    Py_BEGIN_ALLOW_THREADS
     if ( timeout == 0LL) {
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_wait(self->j, (uint64_t) -1);
-        Py_END_ALLOW_THREADS
     }else{
-        Py_BEGIN_ALLOW_THREADS
         r = sd_journal_wait(self->j, timeout * 1E6);
-        Py_END_ALLOW_THREADS
+    }
+    Py_END_ALLOW_THREADS
+    if (r < 0) {
+        errno = -r;
+        PyObject *errtype = r == -ENOMEM ? PyExc_MemoryError :
+                            PyExc_OSError;
+        PyErr_SetFromErrno(errtype);
+        return NULL;
     }
 #if PY_MAJOR_VERSION >=3
     return PyLong_FromLong(r);
@@ -683,14 +559,12 @@ Journal_seek_cursor(Journal *self, PyObject *args)
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_seek_cursor(self->j, cursor);
     Py_END_ALLOW_THREADS
-    if (r == -EINVAL) {
-        PyErr_SetString(PyExc_ValueError, "Invalid cursor");
-        return NULL;
-    }else if (r == -ENOMEM) {
-        PyErr_SetString(PyExc_MemoryError, "Not enough memory");
-        return NULL;
-    }else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error seeking to cursor");
+    if (r < 0) {
+        errno = -r;
+        PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
+                            r == -ENOMEM ? PyExc_MemoryError :
+                            PyExc_OSError;
+        PyErr_SetFromErrno(errtype);
         return NULL;
     }
     Py_RETURN_NONE;
@@ -706,13 +580,10 @@ Journal_iter(PyObject *self)
 static PyObject *
 Journal_iternext(PyObject *self)
 {
-    Journal *iter = (Journal *)self;
-    PyObject *dict, *arg;
+    PyObject *dict;
     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;
@@ -739,14 +610,12 @@ Journal_query_unique(Journal *self, PyObject *args)
     Py_BEGIN_ALLOW_THREADS
     r = sd_journal_query_unique(self->j, query);
     Py_END_ALLOW_THREADS
-    if (r == -EINVAL) {
-        PyErr_SetString(PyExc_ValueError, "Invalid field name");
-        return NULL;
-    } else if (r == -ENOMEM) {
-        PyErr_SetString(PyExc_MemoryError, "Not enough memory");
-        return NULL;
-    } else if (r < 0) {
-        PyErr_SetString(PyExc_RuntimeError, "Error querying journal");
+    if (r < 0) {
+        errno = -r;
+        PyObject *errtype = r == -EINVAL ? PyExc_ValueError :
+                            r == -ENOMEM ? PyExc_MemoryError :
+                            PyExc_OSError;
+        PyErr_SetFromErrno(errtype);
         return NULL;
     }
 
@@ -764,7 +633,7 @@ Journal_query_unique(Journal *self, PyObject *args)
 
     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);
     }
@@ -773,150 +642,6 @@ Journal_query_unique(Journal *self, PyObject *args)
 }
 #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)
 {
@@ -925,8 +650,9 @@ Journal_get_data_threshold(Journal *self, void *closure)
     int r;
 
     r = sd_journal_get_data_threshold(self->j, &cvalue);
-    if (r < 0){
-        PyErr_SetString(PyExc_RuntimeError, "Error getting data threshold");
+    if (r < 0) {
+        errno = -r;
+        PyErr_SetFromErrno(PyExc_OSError);
         return NULL;
     }
 
@@ -959,8 +685,9 @@ Journal_set_data_threshold(Journal *self, PyObject *value, void *closure)
 #else
     r = sd_journal_set_data_threshold(self->j, (size_t) PyInt_AsLong(value));
 #endif
-    if (r < 0){
-        PyErr_SetString(PyExc_RuntimeError, "Error setting data threshold");
+    if (r < 0) {
+        errno = -r;
+        PyErr_SetFromErrno(PyExc_OSError);
         return -1;
     }
     return 0;
@@ -972,16 +699,6 @@ static PyGetSetDef Journal_getseters[] = {
     (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}
 };
 
@@ -1010,12 +727,6 @@ static PyMethodDef Journal_methods[] = {
     {"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 */
 };
 
@@ -1057,7 +768,7 @@ static PyTypeObject JournalType = {
     0,                                /* tp_dictoffset */
     (initproc)Journal_init,           /* tp_init */
     0,                                /* tp_alloc */
-    Journal_new,                      /* tp_new */
+    PyType_GenericNew,                /* tp_new */
 };
 
 #if PY_MAJOR_VERSION >= 3