starlingx
/
ha
Code Issues Proposed changes

Merge "Python 3 compatibility: convert ConfigParser to configparser."

This commit is contained in:
Zuul 2018-10-02 17:03:46 +00:00 committed by Gerrit Code Review
parent fc4fa1c048 b90a7c9a4a
commit 81060ae8ff
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 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)

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

@ -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:

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 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))

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

@ -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)

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.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(',')]

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
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)

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.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(',')]