openstack
/
trove
Code Issues Proposed changes

Merge "Fix SafeConfigParser DeprecationWarning in Python 3.2"

This commit is contained in:
Jenkins 2016-10-05 19:47:37 +00:00 committed by Gerrit Code Review
parent 94131470fe 00b3f8a4c5
commit 473d360b90
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/fix-deprecated-SafeConfigParse-ca3fd3e9f52a8cc8.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- Since SafeConfigParser is deprecated in Python version 3.2,
Trove uses ConfigParser for versions of Python >= 3.2 and
SafeConfigParser for earlier versions. (Bug 1618666)

11
trove/common/stream_codecs.py
View File

@ -19,12 +19,13 @@ import base64
import csv
import json
import re
import sys
import six
from six.moves.configparser import SafeConfigParser
from six.moves import configparser
import xmltodict
import yaml
from trove.common import utils as trove_utils
@ -227,7 +228,11 @@ class IniCodec(StreamCodec):
return buf
def _init_config_parser(self, sections=None):
parser = SafeConfigParser(allow_no_value=True)
# SafeConfigParser was deprecated in Python 3.2
if sys.version_info >= (3, 2):
parser = configparser.ConfigParser(allow_no_value=True)
else:
parser = configparser.SafeConfigParser(allow_no_value=True)
if sections:
for section in sections:
parser.add_section(section)