starlingx
/
ha
Code Issues Proposed changes

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 <zhangyangyang@unionpay.com>
This commit is contained in:
zhangyangyang 2018-09-07 13:59:33 +08:00
parent 82ec10e9bd
commit b90a7c9a4a
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service-mgmt-api/sm-api/sm_api/api/api.py
View File

@ -6,7 +6,7 @@
import os import os
import sys import sys
import argparse import argparse
import ConfigParser from six.moves import configparser
import eventlet import eventlet
from wsgiref import simple_server from wsgiref import simple_server
@ -49,11 +49,11 @@ def main():
handler_class=get_handler_cls()) handler_class=get_handler_cls())
wsgi.serve_forever() wsgi.serve_forever()
except ConfigParser.NoOptionError as e: except configparser.NoOptionError as e:
print(e) print(e)
sys.exit(-2) sys.exit(-2)
except ConfigParser.NoSectionError as e: except configparser.NoSectionError as e:
print(e) print(e)
sys.exit(-3) sys.exit(-3)

4
service-mgmt-api/sm-api/sm_api/common/config.py
View File

@ -8,12 +8,12 @@
Configuration Configuration
""" """
import ConfigParser from six.moves import configparser
CONF = None CONF = None
class Config(ConfigParser.ConfigParser): class Config(configparser.ConfigParser):
def as_dict(self): def as_dict(self):
d = dict(self._sections) d = dict(self._sections)
for key in d: for key in d:

4
service-mgmt-api/sm-api/sm_api/openstack/common/log.py
View File

@ -33,7 +33,7 @@ It also allows setting of formatting information through conf.
""" """
import ConfigParser from six.moves import configparser
import cStringIO import cStringIO
import inspect import inspect
import itertools import itertools
@ -351,7 +351,7 @@ class LogConfigError(Exception):
def _load_log_config(log_config): def _load_log_config(log_config):
try: try:
logging.config.fileConfig(log_config) logging.config.fileConfig(log_config)
except ConfigParser.Error as exc: except configparser.Error as exc:
raise LogConfigError(log_config, str(exc)) raise LogConfigError(log_config, str(exc))

6
service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/cmd.py
View File

@ -39,7 +39,7 @@
from __future__ import print_function from __future__ import print_function
import ConfigParser from six.moves import configparser
import logging import logging
import os import os
import pwd import pwd
@ -86,13 +86,13 @@ def main():
# Load configuration # Load configuration
try: try:
rawconfig = ConfigParser.RawConfigParser() rawconfig = configparser.RawConfigParser()
rawconfig.read(configfile) rawconfig.read(configfile)
config = wrapper.RootwrapConfig(rawconfig) config = wrapper.RootwrapConfig(rawconfig)
except ValueError as exc: except ValueError as exc:
msg = "Incorrect value in %s: %s" % (configfile, exc.message) msg = "Incorrect value in %s: %s" % (configfile, exc.message)
_exit_error(execname, msg, RC_BADCONFIG, log=False) _exit_error(execname, msg, RC_BADCONFIG, log=False)
except ConfigParser.Error: except configparser.Error:
_exit_error(execname, "Incorrect configuration file: %s" % configfile, _exit_error(execname, "Incorrect configuration file: %s" % configfile,
RC_BADCONFIG, log=False) RC_BADCONFIG, log=False)

4
service-mgmt-api/sm-api/sm_api/openstack/common/rootwrap/wrapper.py
View File

@ -20,7 +20,7 @@
import ConfigParser from six.moves import configparser
import logging import logging
import logging.handlers import logging.handlers
import os import os
@ -113,7 +113,7 @@ def load_filters(filters_path):
if not os.path.isdir(filterdir): if not os.path.isdir(filterdir):
continue continue
for filterfile in os.listdir(filterdir): for filterfile in os.listdir(filterdir):
filterconfig = ConfigParser.RawConfigParser() filterconfig = configparser.RawConfigParser()
filterconfig.read(os.path.join(filterdir, filterfile)) filterconfig.read(os.path.join(filterdir, filterfile))
for (name, value) in filterconfig.items("Filters"): for (name, value) in filterconfig.items("Filters"):
filterdefinition = [string.strip(s) for s in value.split(',')] filterdefinition = [string.strip(s) for s in value.split(',')]

6
service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/cmd.py
View File

@ -27,7 +27,7 @@ Root wrapper for OpenStack services
from __future__ import print_function from __future__ import print_function
import ConfigParser from six.moves import configparser
import logging import logging
import os import os
import pwd import pwd
@ -75,13 +75,13 @@ def main():
# Load configuration # Load configuration
try: try:
rawconfig = ConfigParser.RawConfigParser() rawconfig = configparser.RawConfigParser()
rawconfig.read(configfile) rawconfig.read(configfile)
config = wrapper.RootwrapConfig(rawconfig) config = wrapper.RootwrapConfig(rawconfig)
except ValueError as exc: except ValueError as exc:
msg = "Incorrect value in %s: %s" % (configfile, exc.message) msg = "Incorrect value in %s: %s" % (configfile, exc.message)
_exit_error(execname, msg, RC_BADCONFIG, log=False) _exit_error(execname, msg, RC_BADCONFIG, log=False)
except ConfigParser.Error: except configparser.Error:
_exit_error(execname, "Incorrect configuration file: %s" % configfile, _exit_error(execname, "Incorrect configuration file: %s" % configfile,
RC_BADCONFIG, log=False) RC_BADCONFIG, log=False)

4
service-mgmt-client/sm-client/sm_client/openstack/common/rootwrap/wrapper.py
View File

@ -20,7 +20,7 @@
import ConfigParser from six.moves import configparser
import logging import logging
import logging.handlers import logging.handlers
import os import os
@ -114,7 +114,7 @@ def load_filters(filters_path):
if not os.path.isdir(filterdir): if not os.path.isdir(filterdir):
continue continue
for filterfile in os.listdir(filterdir): for filterfile in os.listdir(filterdir):
filterconfig = ConfigParser.RawConfigParser() filterconfig = configparser.RawConfigParser()
filterconfig.read(os.path.join(filterdir, filterfile)) filterconfig.read(os.path.join(filterdir, filterfile))
for (name, value) in filterconfig.items("Filters"): for (name, value) in filterconfig.items("Filters"):
filterdefinition = [string.strip(s) for s in value.split(',')] filterdefinition = [string.strip(s) for s in value.split(',')]