summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/log.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/openstack/common/log.py b/openstack/common/log.py
index 465886b..c7e729c 100644
--- a/openstack/common/log.py
+++ b/openstack/common/log.py
@@ -29,8 +29,6 @@ It also allows setting of formatting information through conf.
"""
-import ConfigParser
-import cStringIO
import inspect
import itertools
import logging
@@ -41,6 +39,7 @@ import sys
import traceback
from oslo.config import cfg
+from six import moves
from openstack.common.gettextutils import _ # noqa
from openstack.common import importutils
@@ -348,7 +347,7 @@ class LogConfigError(Exception):
def _load_log_config(log_config):
try:
logging.config.fileConfig(log_config)
- except ConfigParser.Error as exc:
+ except moves.configparser.Error as exc:
raise LogConfigError(log_config, str(exc))
@@ -521,7 +520,7 @@ class ContextFormatter(logging.Formatter):
if not record:
return logging.Formatter.formatException(self, exc_info)
- stringbuffer = cStringIO.StringIO()
+ stringbuffer = moves.StringIO()
traceback.print_exception(exc_info[0], exc_info[1], exc_info[2],
None, stringbuffer)
lines = stringbuffer.getvalue().split('\n')