From: Kefu Chai Date: Sun, 28 Jun 2020 12:50:24 +0000 (+0800) Subject: doc: drop py2 support X-Git-Tag: wip-pdonnell-testing-20200918.022351~781^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9442683f61f10a8dae519f3d42633d94d15f24d6;p=ceph-ci.git doc: drop py2 support Signed-off-by: Kefu Chai --- diff --git a/doc/_ext/ceph_releases.py b/doc/_ext/ceph_releases.py index 057e13bbc81..a45809e2aa0 100644 --- a/doc/_ext/ceph_releases.py +++ b/doc/_ext/ceph_releases.py @@ -5,7 +5,6 @@ # https://bitbucket.org/prometheus/sphinxcontrib-htsql/src/331a542c29a102eec9f8cba44797e53a49de2a49/sphinxcontrib/htsql.py?at=default&fileviewer=file-view-default # into the glory that follows: import json -import six import yaml import sphinx import datetime @@ -49,7 +48,7 @@ class CephReleases(Directive): row_node.extend(nodes.entry(h, nodes.paragraph(text=h)) for h in ["Version", "Initial release", "Latest", "End of life (estimated)"]) - releases = six.iteritems(releases) + releases = releases.items() releases = sorted(releases, key=lambda t: t[0], reverse=True) tbody = nodes.tbody() @@ -127,7 +126,7 @@ class CephTimeline(Directive): display_releases = self.arguments[1:] timeline = [] - for code_name, info in six.iteritems(releases["releases"]): + for code_name, info in releases["releases"].items(): if code_name in display_releases: for release in info.get("releases", []): released = release["released"]