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 #3487: intersphinx: failed to refer options

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-03-03 00:50:16 +09:00
parent 042c2beafa
commit 811df6b2e3
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -23,6 +23,7 @@ Bugs fixed
return code return code
* #2073, #3443, #3490: gettext builder that writes pot files unless the content * #2073, #3443, #3490: gettext builder that writes pot files unless the content
are same without creation date. Thanks to Yoshiki Shibukawa. are same without creation date. Thanks to Yoshiki Shibukawa.
* #3487: intersphinx: failed to refer options
Testing Testing
-------- --------

2
sphinx/domains/std.py
View File

@ -789,7 +789,7 @@ class StandardDomain(Domain):
for doc in self.env.all_docs: for doc in self.env.all_docs:
yield (doc, clean_astext(self.env.titles[doc]), 'doc', doc, '', -1) yield (doc, clean_astext(self.env.titles[doc]), 'doc', doc, '', -1)
for (prog, option), info in iteritems(self.data['progoptions']): for (prog, option), info in iteritems(self.data['progoptions']):
yield (option, option, 'option', info[0], info[1], 1) yield (option, option, 'cmdoption', info[0], info[1], 1)
for (type, name), info in iteritems(self.data['objects']): for (type, name), info in iteritems(self.data['objects']):
yield (name, name, type, info[0], info[1], yield (name, name, type, info[0], info[1],
self.object_types[type].attrs['searchprio']) self.object_types[type].attrs['searchprio'])

3
sphinx/ext/intersphinx.py
View File

@ -321,6 +321,9 @@ def missing_reference(app, env, node, contnode):
if not objtypes: if not objtypes:
return return
objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes] objtypes = ['%s:%s' % (domain, objtype) for objtype in objtypes]
if 'std:cmdoption' in objtypes:
# until Sphinx-1.6, cmdoptions are stored as std:option
objtypes.append('std:option')
to_try = [(env.intersphinx_inventory, target)] to_try = [(env.intersphinx_inventory, target)]
in_set = None in_set = None
if ':' in target: if ':' in target: