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 #4662: any refs with term targets crash when an ambiguity is encountered

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-02-23 23:05:48 +09:00
parent 6701676ddb
commit c41e746b7a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -42,6 +42,8 @@ Bugs fixed
* #4655: Fix incomplete localization strings in Polish * #4655: Fix incomplete localization strings in Polish
* #4653: Fix error reporting for parameterless ImportErrors * #4653: Fix error reporting for parameterless ImportErrors
* #4664: Reading objects.inv fails again * #4664: Reading objects.inv fails again
* #4662: ``any`` refs with ``term`` targets crash when an ambiguity is
encountered
Testing Testing
-------- --------

8
sphinx/transforms/post_transforms/__init__.py
View File

@ -135,10 +135,12 @@ class ReferencesResolver(SphinxTransform):
if not results: if not results:
return None return None
if len(results) > 1: if len(results) > 1:
nice_results = ' or '.join(':%s:`%s`' % (name, role["reftitle"]) def stringify(name, node):
for name, role in results) reftitle = node.get('reftitle', node.astext())
return ':%s:`%s`' % (name, reftitle)
candidates = ' or '.join(stringify(name, role) for name, role in results)
logger.warning(__('more than one target found for \'any\' cross-' logger.warning(__('more than one target found for \'any\' cross-'
'reference %r: could be %s'), target, nice_results, 'reference %r: could be %s'), target, candidates,
location=node) location=node)
res_role, newnode = results[0] res_role, newnode = results[0]
# Override "any" class with the actual role type to get the styling # Override "any" class with the actual role type to get the styling