openstack/nova
Code Issues Proposed changes

Merge "Fix SafeConfigParser DeprecationWarning in Python 3.2"

Browse Source
This commit is contained in:
Jenkins
2016-09-20 19:09:11 +00:00
committed by Gerrit Code Review
parent b93b9d6922 f8c1ee3950
commit 7e8ed21e40
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/ext/feature_matrix.py
View File

@@ -21,6 +21,7 @@ It is used via a single directive in the .rst file
""" """
import re import re
import sys
from six.moves import configparser from six.moves import configparser
@@ -158,7 +159,11 @@ class FeatureMatrixDirective(rst.Directive):
:returns: Matrix instance :returns: Matrix instance
""" """
cfg = configparser.SafeConfigParser() # SafeConfigParser was deprecated in Python 3.2
if sys.version_info >= (3, 2):
cfg = configparser.ConfigParser()
else:
cfg = configparser.SafeConfigParser()
env = self.state.document.settings.env env = self.state.document.settings.env
filename = self.arguments[0] filename = self.arguments[0]
rel_fpath, fpath = env.relfn2path(filename) rel_fpath, fpath = env.relfn2path(filename)

7
doc/ext/support_matrix.py
View File

@@ -23,6 +23,7 @@ It is used via a single directive in the .rst file
""" """
import re import re
import sys
import six import six
from six.moves import configparser from six.moves import configparser
@@ -129,7 +130,11 @@ class SupportMatrixDirective(rst.Directive):
:returns: SupportMatrix instance :returns: SupportMatrix instance
""" """
cfg = configparser.SafeConfigParser() # SafeConfigParser was deprecated in Python 3.2
if sys.version_info >= (3, 2):
cfg = configparser.ConfigParser()
else:
cfg = configparser.SafeConfigParser()
env = self.state.document.settings.env env = self.state.document.settings.env
fname = self.arguments[0] fname = self.arguments[0]
rel_fpath, fpath = env.relfn2path(fname) rel_fpath, fpath = env.relfn2path(fname)