From b0a11d171c99d3719d11b6ab7885e885d63a75b9 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 17 Nov 2016 21:20:58 +0900 Subject: [PATCH] Use env.get_domain() instead env.domains[] --- sphinx/application.py | 2 +- sphinx/environment/managers/toctree.py | 2 +- sphinx/ext/intersphinx.py | 2 +- sphinx/transforms/__init__.py | 2 +- sphinx/util/docutils.py | 4 ++-- sphinx/writers/latex.py | 2 +- sphinx/writers/texinfo.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sphinx/application.py b/sphinx/application.py index 08075d8e1..e8e212696 100644 --- a/sphinx/application.py +++ b/sphinx/application.py @@ -332,7 +332,7 @@ class Sphinx(object): def _init_enumerable_nodes(self): # type: () -> None for node, settings in iteritems(self.enumerable_nodes): - self.env.domains['std'].enumerable_nodes[node] = settings # type: ignore + self.env.get_domain('std').enumerable_nodes[node] = settings # type: ignore # ---- main "build" method ------------------------------------------------- diff --git a/sphinx/environment/managers/toctree.py b/sphinx/environment/managers/toctree.py index 195349d3e..26c8f385d 100644 --- a/sphinx/environment/managers/toctree.py +++ b/sphinx/environment/managers/toctree.py @@ -559,7 +559,7 @@ class Toctree(EnvironmentManager): continue - figtype = self.env.domains['std'].get_figtype(subnode) # type: ignore + figtype = self.env.get_domain('std').get_figtype(subnode) # type: ignore if figtype and subnode['ids']: register_fignumber(docname, secnum, figtype, subnode) diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index df561204e..42aafdf94 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -341,7 +341,7 @@ def missing_reference(app, env, node, contnode): if not domain: # only objects in domains are in the inventory return - objtypes = env.domains[domain].objtypes_for_role(node['reftype']) + objtypes = env.get_domain(domain).objtypes_for_role(node['reftype']) if not objtypes: return objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes] diff --git a/sphinx/transforms/__init__.py b/sphinx/transforms/__init__.py index 68e45d62d..ab8f86500 100644 --- a/sphinx/transforms/__init__.py +++ b/sphinx/transforms/__init__.py @@ -104,7 +104,7 @@ class AutoNumbering(Transform): def apply(self): # type: () -> None - domain = self.document.settings.env.domains['std'] + domain = self.document.settings.env.get_domain('std') for node in self.document.traverse(nodes.Element): if domain.is_enumerable_node(node) and domain.get_numfig_title(node) is not None: diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py index a18d0b560..286b2729b 100644 --- a/sphinx/util/docutils.py +++ b/sphinx/util/docutils.py @@ -77,7 +77,7 @@ class sphinx_domains(object): if ':' in name: domain_name, name = name.split(':', 1) if domain_name in self.env.domains: - domain = self.env.domains[domain_name] + domain = self.env.get_domain(domain_name) element = getattr(domain, type)(name) if element is not None: return element, [] @@ -90,7 +90,7 @@ class sphinx_domains(object): return element, [] # always look in the std domain - element = getattr(self.env.domains['std'], type)(name) + element = getattr(self.env.get_domain('std'), type)(name) if element is not None: return element, [] diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index e084c0b49..9bae7a4b4 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -1812,7 +1812,7 @@ class LaTeXTranslator(nodes.NodeVisitor): self.next_section_ids.update(node['ids']) return else: - domain = self.builder.env.domains['std'] + domain = self.builder.env.get_domain('std') figtype = domain.get_figtype(next) if figtype and domain.get_numfig_title(next): ids = set() diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py index 0a9a42aca..fbd8b17a5 100644 --- a/sphinx/writers/texinfo.py +++ b/sphinx/writers/texinfo.py @@ -1584,7 +1584,7 @@ class TexinfoTranslator(nodes.NodeVisitor): self.add_anchor(id, node) # use the full name of the objtype for the category try: - domain = self.builder.env.domains[node.parent['domain']] + domain = self.builder.env.get_domain(node.parent['domain']) primary = self.builder.config.primary_domain name = domain.get_type_name(domain.object_types[objtype], primary == domain.name)