systemd-python: add _Reader.closed attribute

This should make the file interface of _Reader complete.

diff --git a/TODO b/TODO
index c73e8dc9804089a5c50104a51ba3bdac63f69a79..715dd9dbc8f13dcca5a661b346181bb081166f17 100644 (file)
--- a/TODO
+++ b/TODO
@@ -586,8 +586,6 @@ Features:
    - allow reading of only select fields in systemd.journal._reader.Reader
    - export sd_journal_test_cursor in systemd.journal._reader.Reader
    - export sd_journal_get_usage in systemd.journal._reader.Reader
-   - add systemd.journal._reader._Reader.closed attribute (it can
-     be just "return self->j != NULL")
    - figure out a simple way to wait for journal events in a way that
      works with ^C
    - add documentation to systemd.daemon

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 6759555c126ae26cb9d82bb4e5ceaa3cb149251c..67358e3061d536f2a6b68ceafd8b53b682be3860 100644 (file)
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -666,12 +666,24 @@ static int Reader_set_data_threshold(Reader *self, PyObject *value, void *closur
     return set_error(r, NULL, NULL);
 }
 
-static PyGetSetDef Reader_getseters[] = {
+PyDoc_STRVAR(closed__doc__,
+             "True iff journal is closed");
+static PyObject* Reader_get_closed(Reader *self, void *closure)
+{
+    return PyBool_FromLong(self->j == NULL);
+}
+
+static PyGetSetDef Reader_getsetters[] = {
     {(char*) "data_threshold",
      (getter) Reader_get_data_threshold,
      (setter) Reader_set_data_threshold,
      (char*) data_threshold__doc__,
      NULL},
+    {(char*) "closed",
+     (getter) Reader_get_closed,
+     NULL,
+     (char*) closed__doc__,
+     NULL},
     {NULL}
 };
 
@@ -727,7 +739,7 @@ static PyTypeObject ReaderType = {
     Reader_iternext,                          /* tp_iternext */
     Reader_methods,                           /* tp_methods */
     0,                                        /* tp_members */
-    Reader_getseters,                         /* tp_getset */
+    Reader_getsetters,                        /* tp_getset */
     0,                                        /* tp_base */
     0,                                        /* tp_dict */
     0,                                        /* tp_descr_get */