diff options
author | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 22:38:53 +0200 |
---|---|---|
committer | Rémi Cardona <remi.cardona@free.fr> | 2014-07-16 22:38:53 +0200 |
commit | 9b3fc9cc526a5d665d46a79217130462805845dd (patch) | |
tree | f0af8248bd072a41726f93d307c07bfa7985741d | |
parent | 72bc9434015bd6453add8869fdff951fe12735db (diff) | |
download | logilab-common-9b3fc9cc526a5d665d46a79217130462805845dd.tar.gz |
[py3k] Import configparser from six.moves
-rw-r--r-- | configuration.py | 5 | ||||
-rw-r--r-- | testlib.py | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/configuration.py b/configuration.py index 58746b0..ff98f58 100644 --- a/configuration.py +++ b/configuration.py @@ -120,11 +120,10 @@ import sys import re from os.path import exists, expanduser from copy import copy -from ConfigParser import ConfigParser from warnings import warn from six import string_types -from six.moves import range +from six.moves import range, configparser as cp from logilab.common.compat import raw_input, str_encode as _encode from logilab.common.deprecation import deprecated @@ -449,7 +448,7 @@ class OptionsManagerMixIn(object): def reset_parsers(self, usage='', version=None): # configuration file parser - self.cfgfile_parser = ConfigParser() + self.cfgfile_parser = cp.ConfigParser() # command line parser self.cmdline_parser = optik_ext.OptionParser(usage=usage, version=version) self.cmdline_parser.options_manager = self @@ -55,12 +55,11 @@ import math import warnings from shutil import rmtree from operator import itemgetter -from ConfigParser import ConfigParser from itertools import dropwhile from inspect import isgeneratorfunction from six import string_types -from six.moves import builtins, range +from six.moves import builtins, range, configparser from logilab.common.deprecation import deprecated @@ -1263,11 +1262,11 @@ class MockSMTP: """ignore quit""" -class MockConfigParser(ConfigParser): +class MockConfigParser(configparser.ConfigParser): """fake ConfigParser.ConfigParser""" def __init__(self, options): - ConfigParser.__init__(self) + configparser.ConfigParser.__init__(self) for section, pairs in options.iteritems(): self.add_section(section) for key, value in pairs.iteritems(): |