Merge "Fix SafeConfigParser DeprecationWarning in Python 3.2+"
This commit is contained in:
commit
2612aac297
@ -13,8 +13,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
import sys
|
||||||
import collections
|
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from six.moves import configparser
|
from six.moves import configparser
|
||||||
@ -105,10 +104,10 @@ _config_defaults = {'user_domain_id': 'default',
|
|||||||
'project_domain_id': 'default',
|
'project_domain_id': 'default',
|
||||||
'project_domain_name': None}
|
'project_domain_name': None}
|
||||||
|
|
||||||
# NOTE(bourke): The default dict_type is collections.OrderedDict in py27, but
|
if sys.version_info >= (3, 2):
|
||||||
# we must set manually for compatibility with py26
|
CONFIG = configparser.ConfigParser(defaults=_config_defaults)
|
||||||
CONFIG = configparser.SafeConfigParser(defaults=_config_defaults,
|
else:
|
||||||
dict_type=collections.OrderedDict)
|
CONFIG = configparser.SafeConfigParser(defaults=_config_defaults)
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user