IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix TypeError in error message when override is prohibited

Browse Source
This commit is contained in:
Zejun Wu 2018-09-19 05:58:11 -07:00 committed by Takeshi KOMIYA
parent bbb4593bfa
commit 84f6d9f16e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sphinx/registry.py
View File

@ -199,7 +199,7 @@ class SphinxComponentRegistry(object):
directives = self.domain_directives.setdefault(domain, {}) directives = self.domain_directives.setdefault(domain, {})
if name in directives and not override: if name in directives and not override:
raise ExtensionError(__('The %r directive is already registered to %d domain') % raise ExtensionError(__('The %r directive is already registered to domain %s') %
(name, domain)) (name, domain))
if not isclass(obj) or not issubclass(obj, Directive): if not isclass(obj) or not issubclass(obj, Directive):
directives[name] = directive_helper(obj, has_content, argument_spec, **option_spec) directives[name] = directive_helper(obj, has_content, argument_spec, **option_spec)
@ -213,7 +213,7 @@ class SphinxComponentRegistry(object):
raise ExtensionError(__('domain %s not yet registered') % domain) raise ExtensionError(__('domain %s not yet registered') % domain)
roles = self.domain_roles.setdefault(domain, {}) roles = self.domain_roles.setdefault(domain, {})
if name in roles and not override: if name in roles and not override:
raise ExtensionError(__('The %r role is already registered to %d domain') % raise ExtensionError(__('The %r role is already registered to domain %s') %
(name, domain)) (name, domain))
roles[name] = role roles[name] = role
@ -224,7 +224,7 @@ class SphinxComponentRegistry(object):
raise ExtensionError(__('domain %s not yet registered') % domain) raise ExtensionError(__('domain %s not yet registered') % domain)
indices = self.domain_indices.setdefault(domain, []) indices = self.domain_indices.setdefault(domain, [])
if index in indices and not override: if index in indices and not override:
raise ExtensionError(__('The %r index is already registered to %d domain') % raise ExtensionError(__('The %r index is already registered to domain %s') %
(index.name, domain)) (index.name, domain))
indices.append(index) indices.append(index)