diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-09-29 21:12:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 21:12:40 +0900 |
| commit | 973c3ffa25f6f14e53382f7a45ffbeee9d252b3c (patch) | |
| tree | d4d500f2dad3bbdab82820f1f4bb2ae5bc97a6ff /sphinx/domains/changeset.py | |
| parent | abcb5bd5eca6ea46ffcc34a55b663083d03f339c (diff) | |
| parent | d2c3d54bb9a46c5e7a0d14c3345e489d7592de9a (diff) | |
| download | sphinx-git-973c3ffa25f6f14e53382f7a45ffbeee9d252b3c.tar.gz | |
Merge branch 'master' into change_master_doc_to_index
Diffstat (limited to 'sphinx/domains/changeset.py')
| -rw-r--r-- | sphinx/domains/changeset.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/domains/changeset.py b/sphinx/domains/changeset.py index ed878b1d3..669d8c5b7 100644 --- a/sphinx/domains/changeset.py +++ b/sphinx/domains/changeset.py @@ -12,7 +12,6 @@ from typing import NamedTuple from docutils import nodes -from six import iteritems from sphinx import addnodes from sphinx import locale @@ -112,7 +111,7 @@ class ChangeSetDomain(Domain): def clear_doc(self, docname): # type: (unicode) -> None - for version, changes in iteritems(self.data['changes']): + for version, changes in self.data['changes'].items(): for changeset in changes[:]: if changeset.docname == docname: changes.remove(changeset) @@ -120,7 +119,7 @@ class ChangeSetDomain(Domain): def merge_domaindata(self, docnames, otherdata): # type: (List[unicode], Dict) -> None # XXX duplicates? - for version, otherchanges in iteritems(otherdata['changes']): + for version, otherchanges in otherdata['changes'].items(): changes = self.data['changes'].setdefault(version, []) for changeset in otherchanges: if changeset.docname in docnames: |