summaryrefslogtreecommitdiff
path: root/trove
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-05 19:47:37 +0000
committerGerrit Code Review <review@openstack.org>2016-10-05 19:47:37 +0000
commit473d360b906dba80f0f914e88b461221c1bfd5f3 (patch)
tree6a9415e19226771a2e6ea163bb393af457c860a5 /trove
parent94131470feb3f2cdff318e584ac3e413eb25b5ed (diff)
parent00b3f8a4c533712db9c7e54c2089b7d644c969d4 (diff)
downloadtrove-473d360b906dba80f0f914e88b461221c1bfd5f3.tar.gz
Merge "Fix SafeConfigParser DeprecationWarning in Python 3.2"
Diffstat (limited to 'trove')
-rw-r--r--trove/common/stream_codecs.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/trove/common/stream_codecs.py b/trove/common/stream_codecs.py
index f79401cb..52fc3000 100644
--- a/trove/common/stream_codecs.py
+++ b/trove/common/stream_codecs.py
@@ -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)