Replaces x.keys() with six.iterkeys(x)
Partially-Implements: blueprint designate-py3 Change-Id: I92994c49b9821b9264e95ac8fa21e16907c4c35c
This commit is contained in:
parent
8aeaaf344d
commit
a5865e270e
@ -21,8 +21,8 @@ It is used via a single directive in the .rst file
|
|||||||
.. support_matrix::
|
.. support_matrix::
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
import six
|
||||||
import ConfigParser
|
import six.moves.configparser as config_parser
|
||||||
|
|
||||||
from docutils import nodes
|
from docutils import nodes
|
||||||
from docutils.parsers import rst
|
from docutils.parsers import rst
|
||||||
@ -88,7 +88,7 @@ class SupportMatrixDirective(rst.Directive):
|
|||||||
:returns: SupportMatrix instance
|
:returns: SupportMatrix instance
|
||||||
"""
|
"""
|
||||||
|
|
||||||
cfg = ConfigParser.SafeConfigParser()
|
cfg = config_parser.SafeConfigParser()
|
||||||
env = self.state.document.settings.env
|
env = self.state.document.settings.env
|
||||||
fname = self.options.get("support-matrix",
|
fname = self.options.get("support-matrix",
|
||||||
"support-matrix.ini")
|
"support-matrix.ini")
|
||||||
@ -118,7 +118,7 @@ class SupportMatrixDirective(rst.Directive):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
status = cfg.get("backends.%s" % item, "status")
|
status = cfg.get("backends.%s" % item, "status")
|
||||||
except ConfigParser.NoOptionError:
|
except config_parser.NoOptionError:
|
||||||
if cfg.get("backends.%s" % item, "type") == "xfr":
|
if cfg.get("backends.%s" % item, "type") == "xfr":
|
||||||
backend = Backend.get_driver(name[0])
|
backend = Backend.get_driver(name[0])
|
||||||
elif cfg.get("backends.%s" % item, "type") == "agent":
|
elif cfg.get("backends.%s" % item, "type") == "agent":
|
||||||
@ -255,7 +255,7 @@ class SupportMatrixDirective(rst.Directive):
|
|||||||
|
|
||||||
content.append(detailstitle)
|
content.append(detailstitle)
|
||||||
|
|
||||||
for key in matrix.backends.keys():
|
for key in six.iterkeys(matrix.backends):
|
||||||
|
|
||||||
content.append(
|
content.append(
|
||||||
self._build_backend_detail_table(
|
self._build_backend_detail_table(
|
||||||
@ -313,7 +313,7 @@ class SupportMatrixDirective(rst.Directive):
|
|||||||
|
|
||||||
summarytitle = nodes.title(text="Backends - Summary")
|
summarytitle = nodes.title(text="Backends - Summary")
|
||||||
summary = nodes.table()
|
summary = nodes.table()
|
||||||
cols = len(matrix.backends.keys())
|
cols = len(list(six.iterkeys(matrix.backends)))
|
||||||
cols += 2
|
cols += 2
|
||||||
summarygroup = nodes.tgroup(cols=cols)
|
summarygroup = nodes.tgroup(cols=cols)
|
||||||
summarybody = nodes.tbody()
|
summarybody = nodes.tbody()
|
||||||
@ -350,7 +350,7 @@ class SupportMatrixDirective(rst.Directive):
|
|||||||
summaryhead.append(header)
|
summaryhead.append(header)
|
||||||
|
|
||||||
grades = matrix.grades
|
grades = matrix.grades
|
||||||
impls = matrix.backends.keys()
|
impls = list(six.iterkeys(matrix.backends))
|
||||||
impls.sort()
|
impls.sort()
|
||||||
for grade in grades:
|
for grade in grades:
|
||||||
for backend in impls:
|
for backend in impls:
|
||||||
|
Loading…
Reference in New Issue
Block a user