From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 21 Feb 2013 14:08:01 +0000 (+0100)
Subject: systemd-python: hide ChainMap import
X-Git-Tag: v198~140^2~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5c083fa815d7357d107e76ffb9a5161956c3aec5

systemd-python: hide ChainMap import
---

diff --git a/src/python-systemd/journal.py b/src/python-systemd/journal.py
index 892a56ff2..4d71564c6 100644
--- a/src/python-systemd/journal.py
+++ b/src/python-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)