dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 06:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemd-python: some python3 and bug fixes

Browse Source
This commit is contained in:
Steven Hiscocks
2013-02-16 13:40:44 +00:00
committed by Zbigniew Jędrzejewski-Szmek
parent 6a71de70e5
commit bf1ced5503
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/python-systemd/journal.py
View File

@@ -26,6 +26,8 @@ import uuid
import traceback as _traceback
import os as _os
import logging as _logging
if sys.version_info >= (3,):
from collections import ChainMap
from syslog import (LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR,
LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG)
from ._journal import sendv, stream_fd
@@ -90,7 +92,7 @@ class Journal(_Journal):
def _convert_field(self, key, value):
try:
result = self.converters[key](value)
except KeyError:
except:
# Default conversion in unicode
try:
result = _convert_unicode(value)
@@ -101,13 +103,18 @@ class Journal(_Journal):
def _convert_entry(self, entry):
result = {}
for key, value in entry.iteritems():
for key, value in entry.items():
if isinstance(value, list):
result[key] = [self._convert_field(key, val) for val in value]
else:
result[key] = self._convert_field(key, value)
return result
def add_match(self, *args, **kwargs):
args = list(args)
args.extend(_make_line(key, val) for key, val in kwargs.items())
super(Journal, self).add_match(*args)
def get_next(self, *args, **kwargs):
return self._convert_entry(
super(Journal, self).get_next(*args, **kwargs))