diff options
| author | Jeongsoo, Park <toracle@gmail.com> | 2017-03-12 03:57:44 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-03-11 13:57:44 -0500 |
| commit | dce0a855c3281e7051b1cbe0f73386d1c90ef320 (patch) | |
| tree | 92c4d65659265485aa92508c9aff5266fa11299d /systemd/journal.py | |
| parent | 35a27a437229a3723c8cd604819d7d90e8105010 (diff) | |
| download | python-systemd-dce0a855c3281e7051b1cbe0f73386d1c90ef320.tar.gz | |
replace dict.iteritems() with dict.items() to support py3 (#39)
py3 doesn't have dict.iteritems() anymore.
Diffstat (limited to 'systemd/journal.py')
| -rw-r--r-- | systemd/journal.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/systemd/journal.py b/systemd/journal.py index cd83377..48a36b4 100644 --- a/systemd/journal.py +++ b/systemd/journal.py @@ -546,6 +546,8 @@ class JournalHandler(_logging.Handler): raise ValueError('Invalid field name: ' + name) if 'SYSLOG_IDENTIFIER' not in kwargs: kwargs['SYSLOG_IDENTIFIER'] = _sys.argv[0] + + self.send = kwargs.pop('SENDER_FUNCTION', send) self._extra = kwargs def emit(self, record): @@ -559,9 +561,9 @@ class JournalHandler(_logging.Handler): msg = self.format(record) pri = self.mapPriority(record.levelno) mid = getattr(record, 'MESSAGE_ID', None) - extras = { k:str(v) for k,v in self._extra.iteritems() } + extras = { k:str(v) for k,v in self._extra.items() } extras.update({ - k:str(v) for k,v in record.__dict__.iteritems() + k:str(v) for k,v in record.__dict__.items() }) if record.exc_text: @@ -573,16 +575,16 @@ class JournalHandler(_logging.Handler): if record.args: extras['CODE_ARGS'] = str(record.args) - send(msg, - MESSAGE_ID=mid, - PRIORITY=format(pri), - LOGGER=record.name, - THREAD_NAME=record.threadName, - PROCESS_NAME=record.processName, - CODE_FILE=record.pathname, - CODE_LINE=record.lineno, - CODE_FUNC=record.funcName, - **extras) + self.send(msg, + MESSAGE_ID=mid, + PRIORITY=format(pri), + LOGGER=record.name, + THREAD_NAME=record.threadName, + PROCESS_NAME=record.processName, + CODE_FILE=record.pathname, + CODE_LINE=record.lineno, + CODE_FUNC=record.funcName, + **extras) except Exception: self.handleError(record) |