diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-05-16 00:38:39 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-05-16 00:45:06 -0400 |
| commit | 0a0c35d151570cca5ccd30befaa19c87b9c8c92d (patch) | |
| tree | a4815548cebd6ce189735fe05e00239197ee11ee | |
| parent | 28f30cf274398ab80c71ea0c2afec4b94f8ba76e (diff) | |
systemd-python: do not attempt to convert str to bytes
Bug-spotted-by: Steven Hiscocks <steven-systemd@hiscocks.me.uk>
| -rw-r--r-- | src/python-systemd/journal.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py index 9ef1ede229..8fd1bb357c 100644 --- a/src/python-systemd/journal.py +++ b/src/python-systemd/journal.py @@ -55,6 +55,9 @@ def _convert_realtime(t): def _convert_timestamp(s): return _datetime.datetime.fromtimestamp(int(s) / 1000000) +def _convert_trivial(x): + return x + if _sys.version_info >= (3,): def _convert_uuid(s): return _uuid.UUID(s.decode()) @@ -87,6 +90,7 @@ DEFAULT_CONVERTERS = { '__REALTIME_TIMESTAMP': _convert_realtime, '_SOURCE_MONOTONIC_TIMESTAMP': _convert_source_monotonic, '__MONOTONIC_TIMESTAMP': _convert_monotonic, + '__CURSOR': _convert_trivial, 'COREDUMP': bytes, 'COREDUMP_PID': int, 'COREDUMP_UID': int, |