|
28 | 28 | import logging as _logging |
29 | 29 | from syslog import (LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, |
30 | 30 | LOG_WARNING, LOG_NOTICE, LOG_INFO, LOG_DEBUG) |
31 | | -if _sys.version_info >= (3,3): |
32 | | - from collections import ChainMap as _ChainMap |
33 | 31 |
|
34 | 32 | from ._journal import __version__, sendv, stream_fd |
35 | 33 | from ._reader import (_Reader, NOP, APPEND, INVALIDATE, |
@@ -172,15 +170,9 @@ def __init__(self, flags=None, path=None, files=None, converters=None, namespace |
172 | 170 | flags = 0 |
173 | 171 |
|
174 | 172 | super(Reader, self).__init__(flags, path, files, namespace) |
175 | | - if _sys.version_info >= (3, 3): |
176 | | - self.converters = _ChainMap() |
177 | | - if converters is not None: |
178 | | - self.converters.maps.append(converters) |
179 | | - self.converters.maps.append(DEFAULT_CONVERTERS) |
180 | | - else: |
181 | | - self.converters = DEFAULT_CONVERTERS.copy() |
182 | | - if converters is not None: |
183 | | - self.converters.update(converters) |
| 173 | + self.converters = DEFAULT_CONVERTERS.copy() |
| 174 | + if converters is not None: |
| 175 | + self.converters.update(converters) |
184 | 176 |
|
185 | 177 | def _convert_field(self, key, value): |
186 | 178 | """Convert value using self.converters[key]. |
|
0 commit comments