summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlandos <bugs-github@antipoul.fr>2018-07-26 11:24:17 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-11-12 19:19:47 +0100
commit2166b5759ca0ead2b0ba1bf28eef5220268ae0ef (patch)
tree8bfdf88fdee4b20181a0ce5eba29cda67389dce4
parent9cbc4e93b40b452296be6daf0f61a2533630a007 (diff)
downloadpython-systemd-2166b5759ca0ead2b0ba1bf28eef5220268ae0ef.tar.gz
journal: remove ChainMapmaster
"after some quick testing, the execution time got halved (32-ish seconds to 16-ish seconds) when going through all journal entries." Closes #63.
-rw-r--r--systemd/journal.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/systemd/journal.py b/systemd/journal.py
index c6b3a01..54e54ca 100644
--- a/systemd/journal.py
+++ b/systemd/journal.py
@@ -28,8 +28,6 @@ import os as _os
import logging as _logging
from syslog import (LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR,
LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG)
-if _sys.version_info >= (3,3):
- from collections import ChainMap as _ChainMap
from ._journal import __version__, sendv, stream_fd
from ._reader import (_Reader, NOP, APPEND, INVALIDATE,
@@ -172,15 +170,9 @@ class Reader(_Reader):
flags = 0
super(Reader, self).__init__(flags, path, files, namespace)
- if _sys.version_info >= (3, 3):
- self.converters = _ChainMap()
- if converters is not None:
- self.converters.maps.append(converters)
- self.converters.maps.append(DEFAULT_CONVERTERS)
- else:
- self.converters = DEFAULT_CONVERTERS.copy()
- if converters is not None:
- self.converters.update(converters)
+ self.converters = DEFAULT_CONVERTERS.copy()
+ if converters is not None:
+ self.converters.update(converters)
def _convert_field(self, key, value):
"""Convert value using self.converters[key].