summaryrefslogtreecommitdiff
path: root/src/python-systemd/journal.py
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-07 11:28:44 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-03-07 11:29:08 -0500
commit0eff0f3bce1d0826765f6e84ff046b10fe5a1a12 (patch)
tree4c02b8cfb44bb2960f9ae9789effe8d3a11641e5 /src/python-systemd/journal.py
parent17edd81a9d1265952c662d5f49c70895d0ab17d7 (diff)
systemd-python: refuse path and flags together in __init__
It's better to explictly check, instead of just documenting it. The return value from init is changed from 1 to -1 on error. Python seems to ignore 1 every second time. Looks like a bug in Python, but the return value doesn't seem to be documented anywhere, and -1 works as expected... so let's just use that.
Diffstat (limited to 'src/python-systemd/journal.py')
-rw-r--r--src/python-systemd/journal.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py
index e9c09e8747..1ed726c33a 100644
--- a/src/python-systemd/journal.py
+++ b/src/python-systemd/journal.py
@@ -114,7 +114,7 @@ class Reader(_Reader):
See systemd.journal-fields(7) for more info on typical fields
found in the journal.
"""
- def __init__(self, flags=LOCAL_ONLY, path=None, converters=None):
+ def __init__(self, flags=0, path=None, converters=None):
"""Create an instance of Reader, which allows filtering and
return of journal entries.
@@ -125,8 +125,7 @@ class Reader(_Reader):
journal files of system services and the kernel.
Argument `path` is the directory of journal files. Note that
- currently flags are ignored when `path` is present as they are
- currently not relevant.
+ `flags` and `path` are exclusive.
Argument `converters` is a dictionary which updates the
DEFAULT_CONVERTERS to convert journal field values. Field