From b90a7c9a4a548eb092599529e71205b627959bfb Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Fri, 7 Sep 2018 13:59:33 +0800 Subject: [PATCH] Python 3 compatibility: convert ConfigParser to configparser. The ConfigParser module in python 2 has been renamed to configparser in Python 3. Story: 2003430 Task: 26335 Change-Id: Ie4b29c44f90cc4feaf7f66f2a855fde3a222e058 Signed-off-by: zhangyangyang --- service-mgmt-api/sm-api/sm_api/api/api.py | 6 +++--- service-mgmt-api/sm-api/sm_api/common/config.py | 4 ++-- service-mgmt-api/sm-api/sm_api/openstack/common/log.py | 4 ++-- .../sm-api/sm_api/openstack/common/rootwrap/cmd.py | 6 +++--- .../sm-api/sm_api/openstack/common/rootwrap/wrapper.py | 4 ++-- .../sm-client/sm_client/openstack/common/rootwrap/cmd.py | 6 +++--- .../sm_client/openstack/common/rootwrap/wrapper.py | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/service-mgmt-api/sm-api/sm_api/api/api.py b/service-mgmt-api/sm-api/sm_api/api/api.py index 78135846..cc61c7ee 100644 --- a/service-mgmt-api/sm-api/sm_api/api/api.py +++ b/service-mgmt-api/sm-api/sm_api/api/api.py @@ -6,7 +6,7 @@ import os import sys import argparse -import ConfigParser +from six.moves import configparser import eventlet from wsgiref import simple_server @@ -49,11 +49,11 @@ def main(): handler_class=get_handler_cls()) wsgi.serve_forever() - except ConfigParser.NoOptionError as e: + except configparser.NoOptionError as e: print(e) sys.exit(-2) - except ConfigParser.NoSectionError as e: + except configparser.NoSectionError as e: print(e) sys.exit(-3) diff --git a/service-mgmt-api/sm-api/sm_api/common/config.py b/service-mgmt-api/sm-api/sm_api/common/config.py index 0ee0273b..2c87f415 100644 --- a/service-mgmt-api/sm-api/sm_api/common/config.py +++ b/service-mgmt-api/sm-api/sm_api/common/config.py @@ -8,12 +8,12 @@ Configuration """ -import ConfigParser +from six.moves import configparser CONF = None -class Config(ConfigParser.ConfigParser): +class Config(configparser.ConfigParser): def as_dict(self): d = dict(self._sections) for key in d: diff --git a/service-mgmt-api/sm-api/sm_api/openstack/common/log.py b/service-mgmt-api/sm-api/sm_api/openstack/common/log.py index 9293af47..628ef188 100644 --- a/service-mgmt-api/sm-api/sm_api/openstack/common/log.py +++ b/service-mgmt-api/sm-api/sm_api/openstack/common/log.py @@ -33,7 +33,7 @@ It also allows setting of formatting information through conf. """ -import ConfigParser +from six.moves import configparser import cStringIO import inspect import itertools @@ -351,7 +351,7 @@ class LogConfigError(Exception): def _load_log_config(log_config): try: logging.config.fileConfig(log_config) - except ConfigParser.Error as exc: + except configparser.Error as exc: raise LogConfigError(log_config, str(exc)) diff --git a/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/cmd.py b/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/cmd.py index 4f104faf..af8a36f1 100755 --- a/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/cmd.py +++ b/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/cmd.py @@ -39,7 +39,7 @@ from __future__ import print_function -import ConfigParser +from six.moves import configparser import logging import os import pwd @@ -86,13 +86,13 @@ def main(): # Load configuration try: - rawconfig = ConfigParser.RawConfigParser() + rawconfig = configparser.RawConfigParser() rawconfig.read(configfile) config = wrapper.RootwrapConfig(rawconfig) except ValueError as exc: msg = "Incorrect value in %s: %s" % (configfile, exc.message) _exit_error(execname, msg, RC_BADCONFIG, log=False) - except ConfigParser.Error: + except configparser.Error: _exit_error(execname, "Incorrect configuration file: %s" % configfile, RC_BADCONFIG, log=False) diff --git a/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/wrapper.py b/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/wrapper.py index 2c807431..0bf4f2a2 100644 --- a/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/wrapper.py +++ b/service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/wrapper.py @@ -20,7 +20,7 @@ -import ConfigParser +from six.moves import configparser import logging import logging.handlers import os @@ -113,7 +113,7 @@ def load_filters(filters_path): if not os.path.isdir(filterdir): continue for filterfile in os.listdir(filterdir): - filterconfig = ConfigParser.RawConfigParser() + filterconfig = configparser.RawConfigParser() filterconfig.read(os.path.join(filterdir, filterfile)) for (name, value) in filterconfig.items("Filters"): filterdefinition = [string.strip(s) for s in value.split(',')] diff --git a/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/cmd.py b/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/cmd.py index 0a4f67ed..2927a2ba 100644 --- a/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/cmd.py +++ b/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/cmd.py @@ -27,7 +27,7 @@ Root wrapper for OpenStack services from __future__ import print_function -import ConfigParser +from six.moves import configparser import logging import os import pwd @@ -75,13 +75,13 @@ def main(): # Load configuration try: - rawconfig = ConfigParser.RawConfigParser() + rawconfig = configparser.RawConfigParser() rawconfig.read(configfile) config = wrapper.RootwrapConfig(rawconfig) except ValueError as exc: msg = "Incorrect value in %s: %s" % (configfile, exc.message) _exit_error(execname, msg, RC_BADCONFIG, log=False) - except ConfigParser.Error: + except configparser.Error: _exit_error(execname, "Incorrect configuration file: %s" % configfile, RC_BADCONFIG, log=False) diff --git a/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/wrapper.py b/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/wrapper.py index 77c6a4e8..313ca8d2 100644 --- a/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/wrapper.py +++ b/service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/wrapper.py @@ -20,7 +20,7 @@ -import ConfigParser +from six.moves import configparser import logging import logging.handlers import os @@ -114,7 +114,7 @@ def load_filters(filters_path): if not os.path.isdir(filterdir): continue for filterfile in os.listdir(filterdir): - filterconfig = ConfigParser.RawConfigParser() + filterconfig = configparser.RawConfigParser() filterconfig.read(os.path.join(filterdir, filterfile)) for (name, value) in filterconfig.items("Filters"): filterdefinition = [string.strip(s) for s in value.split(',')]