summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sphinx/application.py3
-rw-r--r--sphinx/directives/__init__.py2
-rw-r--r--sphinx/environment/collectors/__init__.py4
-rw-r--r--sphinx/environment/collectors/asset.py3
-rw-r--r--sphinx/events.py6
-rw-r--r--sphinx/ext/autodoc/__init__.py8
-rw-r--r--sphinx/ext/autodoc/importer.py4
-rw-r--r--sphinx/ext/doctest.py10
-rw-r--r--sphinx/registry.py3
-rw-r--r--sphinx/search/__init__.py6
-rw-r--r--sphinx/transforms/references.py3
-rw-r--r--sphinx/util/__init__.py4
-rw-r--r--sphinx/util/inspect.py4
-rw-r--r--sphinx/writers/latex.py4
-rw-r--r--sphinx/writers/texinfo.py3
15 files changed, 28 insertions, 39 deletions
diff --git a/sphinx/application.py b/sphinx/application.py
index 25915f93d..c595b7719 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -21,7 +21,6 @@ from inspect import isclass
from os import path
from docutils.parsers.rst import Directive, directives, roles
-from six import itervalues
from six.moves import cStringIO
import sphinx
@@ -1196,7 +1195,7 @@ class Sphinx:
else:
raise ValueError('parallel type %s is not supported' % typ)
- for ext in itervalues(self.extensions):
+ for ext in self.extensions.values():
allowed = getattr(ext, attrname, None)
if allowed is None:
logger.warning(message, ext.name)
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index 1177a258e..1898a1c0c 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -233,7 +233,7 @@ class DefaultDomain(SphinxDirective):
domain_name = self.arguments[0].lower()
# if domain_name not in env.domains:
# # try searching by label
- # for domain in itervalues(env.domains):
+ # for domain in env.domains.values():
# if domain.label.lower() == domain_name:
# domain_name = domain.name
# break
diff --git a/sphinx/environment/collectors/__init__.py b/sphinx/environment/collectors/__init__.py
index 9427d3731..30e1e9480 100644
--- a/sphinx/environment/collectors/__init__.py
+++ b/sphinx/environment/collectors/__init__.py
@@ -9,8 +9,6 @@
:license: BSD, see LICENSE for details.
"""
-from six import itervalues
-
if False:
# For type annotation
from typing import Dict, List, Set # NOQA
@@ -44,7 +42,7 @@ class EnvironmentCollector:
def disable(self, app):
# type: (Sphinx) -> None
assert self.listener_ids is not None
- for listener_id in itervalues(self.listener_ids):
+ for listener_id in self.listener_ids.values():
app.disconnect(listener_id)
self.listener_ids = None
diff --git a/sphinx/environment/collectors/asset.py b/sphinx/environment/collectors/asset.py
index d4dcc5461..d41931ed3 100644
--- a/sphinx/environment/collectors/asset.py
+++ b/sphinx/environment/collectors/asset.py
@@ -15,7 +15,6 @@ from os import path
from docutils import nodes
from docutils.utils import relative_path
-from six import itervalues
from sphinx import addnodes
from sphinx.environment.collectors import EnvironmentCollector
@@ -87,7 +86,7 @@ class ImageCollector(EnvironmentCollector):
# map image paths to unique image names (so that they can be put
# into a single directory)
- for imgpath in itervalues(candidates):
+ for imgpath in candidates.values():
app.env.dependencies[docname].add(imgpath)
if not os.access(path.join(app.srcdir, imgpath), os.R_OK):
logger.warning(__('image file not readable: %s') % imgpath,
diff --git a/sphinx/events.py b/sphinx/events.py
index 7ec805738..0b76d6c9e 100644
--- a/sphinx/events.py
+++ b/sphinx/events.py
@@ -14,8 +14,6 @@ from __future__ import print_function
from collections import OrderedDict, defaultdict
-from six import itervalues
-
from sphinx.errors import ExtensionError
from sphinx.locale import __
@@ -70,13 +68,13 @@ class EventManager:
def disconnect(self, listener_id):
# type: (int) -> None
- for event in itervalues(self.listeners):
+ for event in self.listeners.values():
event.pop(listener_id, None)
def emit(self, name, *args):
# type: (unicode, Any) -> List
results = []
- for callback in itervalues(self.listeners[name]):
+ for callback in self.listeners[name].values():
results.append(callback(*args))
return results
diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
index 67b39c1f2..26a9b14fb 100644
--- a/sphinx/ext/autodoc/__init__.py
+++ b/sphinx/ext/autodoc/__init__.py
@@ -18,7 +18,7 @@ import warnings
from typing import Any
from docutils.statemachine import ViewList
-from six import itervalues, text_type, string_types
+from six import text_type, string_types
import sphinx
from sphinx.deprecation import RemovedInSphinx30Warning
@@ -528,9 +528,9 @@ class Documenter:
(name, self.fullname), type='autodoc')
return False, sorted(selected)
elif self.options.inherited_members:
- return False, sorted((m.name, m.value) for m in itervalues(members))
+ return False, sorted((m.name, m.value) for m in members.values())
else:
- return False, sorted((m.name, m.value) for m in itervalues(members)
+ return False, sorted((m.name, m.value) for m in members.values()
if m.directly_defined)
def filter_members(self, members, want_all):
@@ -652,7 +652,7 @@ class Documenter:
# document non-skipped members
memberdocumenters = [] # type: List[Tuple[Documenter, bool]]
for (mname, member, isattr) in self.filter_members(members, want_all):
- classes = [cls for cls in itervalues(self.documenters)
+ classes = [cls for cls in self.documenters.values()
if cls.can_document_member(member, mname, isattr, self)]
if not classes:
# don't know how to document this member
diff --git a/sphinx/ext/autodoc/importer.py b/sphinx/ext/autodoc/importer.py
index d34222c1e..45bab042b 100644
--- a/sphinx/ext/autodoc/importer.py
+++ b/sphinx/ext/autodoc/importer.py
@@ -16,8 +16,6 @@ import warnings
from collections import namedtuple
from types import FunctionType, MethodType, ModuleType
-from six import iteritems
-
from sphinx.util import logging
from sphinx.util.inspect import isenumclass, safe_getattr
@@ -241,7 +239,7 @@ def get_object_members(subject, objpath, attrgetter, analyzer=None):
members[name] = Attribute(name, True, value)
superclass = subject.__mro__[1]
- for name, value in iteritems(obj_dict):
+ for name, value in obj_dict.items():
if name not in superclass.__dict__:
members[name] = Attribute(name, True, value)
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index a0dccddfb..b2244d032 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.py
@@ -22,7 +22,7 @@ from docutils import nodes
from docutils.parsers.rst import directives
from packaging.specifiers import SpecifierSet, InvalidSpecifier
from packaging.version import Version
-from six import itervalues, StringIO, binary_type
+from six import StringIO, binary_type
import sphinx
from sphinx.builders import Builder
@@ -449,24 +449,24 @@ Doctest summary
groups[groupname] = TestGroup(groupname)
groups[groupname].add_code(code)
for code in add_to_all_groups:
- for group in itervalues(groups):
+ for group in groups.values():
group.add_code(code)
if self.config.doctest_global_setup:
code = TestCode(self.config.doctest_global_setup,
'testsetup', filename=None, lineno=0)
- for group in itervalues(groups):
+ for group in groups.values():
group.add_code(code, prepend=True)
if self.config.doctest_global_cleanup:
code = TestCode(self.config.doctest_global_cleanup,
'testcleanup', filename=None, lineno=0)
- for group in itervalues(groups):
+ for group in groups.values():
group.add_code(code)
if not groups:
return
self._out('\nDocument: %s\n----------%s\n' %
(docname, '-' * len(docname)))
- for group in itervalues(groups):
+ for group in groups.values():
self.test_group(group)
# Separately count results from setup code
res_f, res_t = self.setup_runner.summarize(self._out, verbose=False)
diff --git a/sphinx/registry.py b/sphinx/registry.py
index 09edaf86d..0e7f9bd37 100644
--- a/sphinx/registry.py
+++ b/sphinx/registry.py
@@ -17,7 +17,6 @@ from types import MethodType
from docutils.parsers.rst import Directive
from pkg_resources import iter_entry_points
-from six import itervalues
from sphinx.deprecation import RemovedInSphinx30Warning
from sphinx.domains import ObjType
@@ -170,7 +169,7 @@ class SphinxComponentRegistry:
def create_domains(self, env):
# type: (BuildEnvironment) -> Iterator[Domain]
- for DomainClass in itervalues(self.domains):
+ for DomainClass in self.domains.values():
domain = DomainClass(env)
# transplant components added by extensions
diff --git a/sphinx/search/__init__.py b/sphinx/search/__init__.py
index 88697359c..d02779fa2 100644
--- a/sphinx/search/__init__.py
+++ b/sphinx/search/__init__.py
@@ -12,7 +12,7 @@ import pickle
import re
from os import path
-from six import itervalues, text_type, string_types
+from six import text_type, string_types
from docutils.nodes import raw, comment, title, Text, NodeVisitor, SkipNode
@@ -404,9 +404,9 @@ class IndexBuilder:
new_filenames[docname] = self._filenames[docname]
self._titles = new_titles
self._filenames = new_filenames
- for wordnames in itervalues(self._mapping):
+ for wordnames in self._mapping.values():
wordnames.intersection_update(docnames)
- for wordnames in itervalues(self._title_mapping):
+ for wordnames in self._title_mapping.values():
wordnames.intersection_update(docnames)
def feed(self, docname, filename, title, doctree):
diff --git a/sphinx/transforms/references.py b/sphinx/transforms/references.py
index 40efbf615..bb7c51da7 100644
--- a/sphinx/transforms/references.py
+++ b/sphinx/transforms/references.py
@@ -11,7 +11,6 @@
from docutils import nodes
from docutils.transforms.references import Substitutions
-from six import itervalues
from sphinx.transforms import SphinxTransform
@@ -34,5 +33,5 @@ class SphinxDomains(SphinxTransform):
def apply(self):
# type: () -> None
- for domain in itervalues(self.env.domains):
+ for domain in self.env.domains.values():
domain.process_doc(self.env, self.env.docname, self.document)
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 267c1d391..2618e23ef 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.py
@@ -27,7 +27,7 @@ from os import path
from time import mktime, strptime
from docutils.utils import relative_path
-from six import text_type, binary_type, itervalues
+from six import text_type, binary_type
from six.moves.urllib.parse import urlsplit, urlunsplit, quote_plus, parse_qsl, urlencode
from sphinx.deprecation import RemovedInSphinx30Warning
@@ -266,7 +266,7 @@ def save_traceback(app):
jinja2.__version__, # type: ignore
last_msgs)).encode('utf-8'))
if app is not None:
- for ext in itervalues(app.extensions):
+ for ext in app.extensions.values():
modfile = getattr(ext.module, '__file__', 'unknown')
if isinstance(modfile, bytes):
modfile = modfile.decode(fs_encoding, 'replace')
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index 244999201..1133ba8fa 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.py
@@ -18,7 +18,7 @@ import sys
import typing
from functools import partial
-from six import StringIO, binary_type, string_types, itervalues
+from six import StringIO, binary_type, string_types
from sphinx.util import force_decode
from sphinx.util import logging
@@ -368,7 +368,7 @@ class Signature:
# type: () -> unicode
args = []
last_kind = None
- for i, param in enumerate(itervalues(self.parameters)):
+ for i, param in enumerate(self.parameters.values()):
# skip first argument if subject is bound method
if self.skip_first_argument and i == 0:
continue
diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py
index 8815ce1c1..1bd54a7ea 100644
--- a/sphinx/writers/latex.py
+++ b/sphinx/writers/latex.py
@@ -20,7 +20,7 @@ from os import path
from docutils import nodes, writers
from docutils.writers.latex2e import Babel
-from six import itervalues, text_type
+from six import text_type
from sphinx import addnodes
from sphinx import highlighting
@@ -849,7 +849,7 @@ class LaTeXTranslator(nodes.NodeVisitor):
# latex_domain_indices can be False/True or a list of index names
indices_config = self.builder.config.latex_domain_indices
if indices_config:
- for domain in itervalues(self.builder.env.domains):
+ for domain in self.builder.env.domains.values():
for indexcls in domain.indices:
indexname = '%s-%s' % (domain.name, indexcls.name)
if isinstance(indices_config, list):
diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 2ad3835ce..91e534278 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -14,7 +14,6 @@ import textwrap
from os import path
from docutils import nodes, writers
-from six import itervalues
from sphinx import addnodes, __display_version__
from sphinx.errors import ExtensionError
@@ -497,7 +496,7 @@ class TexinfoTranslator(nodes.NodeVisitor):
indices_config = self.builder.config.texinfo_domain_indices
if indices_config:
- for domain in itervalues(self.builder.env.domains):
+ for domain in self.builder.env.domains.values():
for indexcls in domain.indices:
indexname = '%s-%s' % (domain.name, indexcls.name)
if isinstance(indices_config, list):
View Lorry Controller Status