summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-12-14 23:43:28 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-12-15 20:57:44 -0500
commit5d3be8ccba5fe48b09e2a4e816f21c39038adfd0 (patch)
treeb4fc66e24eb6c2a33c96c8cb30485147138db27d
parent5d1e3fbcdcb03bf1c13cb9bd01b9d6bb62f776d9 (diff)
downloadpython-systemd-5d3be8ccba5fe48b09e2a4e816f21c39038adfd0.tar.gz
_daemon,_reader: return ENOSYS instead of NotImplemented
In _reader we were raising OSError(errno=ENOSYS), but in _dameon we were raising NotImplementedError. Let's always use ENOSYS. Also, make the messages in _reader more specific. Fixes #33.
-rw-r--r--systemd/_daemon.c4
-rw-r--r--systemd/_reader.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/systemd/_daemon.c b/systemd/_daemon.c
index a041b1b..87a33f0 100644
--- a/systemd/_daemon.c
+++ b/systemd/_daemon.c
@@ -145,14 +145,14 @@ static PyObject* notify(PyObject *self, PyObject *args, PyObject *keywds) {
#ifdef HAVE_PID_NOTIFY
r = sd_pid_notify(pid, unset, msg);
#else
- PyErr_SetString(PyExc_NotImplementedError, "Compiled without support for sd_pid_notify");
+ set_error(-ENOSYS, NULL, "Compiled without support for sd_pid_notify");
return NULL;
#endif
} else {
#ifdef HAVE_PID_NOTIFY_WITH_FDS
r = sd_pid_notify_with_fds(pid, unset, msg, arr, n_fds);
#else
- PyErr_SetString(PyExc_NotImplementedError, "Compiled without support for sd_pid_notify_with_fds");
+ set_error(-ENOSYS, NULL, "Compiled without support for sd_pid_notify_with_fds");
return NULL;
#endif
}
diff --git a/systemd/_reader.c b/systemd/_reader.c
index 3a2c218..5b7e191 100644
--- a/systemd/_reader.c
+++ b/systemd/_reader.c
@@ -1048,7 +1048,7 @@ static PyObject* Reader_enumerate_fields(Reader *self, PyObject *args) {
_value_set = NULL;
return value_set;
#else
- set_error(-ENOSYS, NULL, "Not implemented");
+ set_error(-ENOSYS, NULL, "Compiled without support for sd_journal_enumerate_fields");
return NULL;
#endif
}
@@ -1069,7 +1069,7 @@ static PyObject* Reader_has_runtime_files(Reader *self, PyObject *args) {
return PyBool_FromLong(r);
#else
- set_error(-ENOSYS, NULL, "Not implemented");
+ set_error(-ENOSYS, NULL, "Compiled without support for sd_journal_has_runtime_files");
return NULL;
#endif
}
@@ -1090,7 +1090,7 @@ static PyObject* Reader_has_persistent_files(Reader *self, PyObject *args) {
return PyBool_FromLong(r);
#else
- set_error(-ENOSYS, NULL, "Not implemented");
+ set_error(-ENOSYS, NULL, "Compiled without support for sd_journal_has_persistent_files");
return NULL;
#endif
}