Use env.get_domain() instead env.domains[]

This commit is contained in:
Takeshi KOMIYA 2016-11-17 21:20:58 +09:00
parent 2ec179044b
commit b0a11d171c
7 changed files with 8 additions and 8 deletions

View File

@ -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 -------------------------------------------------

View File

@ -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)

View File

@ -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]

View File

@ -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:

View File

@ -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, []

View File

@ -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()

View File

@ -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)