summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-21 15:08:01 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-07-05 14:19:17 -0400
commitcedd0fd2498929600f408c28969b2f744d65cc25 (patch)
tree3b2ad5dab34098038b72efa4f5aca14ffcf71323 /systemd
parent8d697bfd136f6ba8e37aedf9ba06bf8f86845d2d (diff)
downloadpython-systemd-cedd0fd2498929600f408c28969b2f744d65cc25.tar.gz
systemd-python: hide ChainMap import
Diffstat (limited to 'systemd')
-rw-r--r--systemd/journal.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/systemd/journal.py b/systemd/journal.py
index 892a56f..4d71564 100644
--- a/systemd/journal.py
+++ b/systemd/journal.py
@@ -28,7 +28,7 @@ import os as _os
from os import SEEK_SET, SEEK_CUR, SEEK_END
import logging as _logging
if _sys.version_info >= (3,):
- from collections import ChainMap
+ from collections import ChainMap as _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
@@ -112,7 +112,7 @@ class Journal(_Journal):
"""
super(Journal, self).__init__(flags, path)
if _sys.version_info >= (3,3):
- self.converters = ChainMap()
+ self.converters = _ChainMap()
if converters is not None:
self.converters.maps.append(converters)
self.converters.maps.append(DEFAULT_CONVERTERS)