diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-12-16 00:05:35 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2019-12-16 00:05:35 +0900 |
commit | 712c20a3d91cd80247c5625782ba8ada2b2c2378 (patch) | |
tree | d151c391d9bc18aa2ceffa455efa658bafc1ec29 /sphinx/domains/std.py | |
parent | 5a03cac7d369ea71e1414792df62668ca5fd8190 (diff) | |
parent | cb5fab5db90c2177ede34af876b19e58b9dc1263 (diff) | |
download | sphinx-git-712c20a3d91cd80247c5625782ba8ada2b2c2378.tar.gz |
Merge branch '2.0'
Diffstat (limited to 'sphinx/domains/std.py')
-rw-r--r-- | sphinx/domains/std.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py index 1e4f1b10f..10ca58c5b 100644 --- a/sphinx/domains/std.py +++ b/sphinx/domains/std.py @@ -611,15 +611,13 @@ class StandardDomain(Domain): sectname = self.get_numfig_title(node) if not sectname: continue - elif node.traverse(addnodes.toctree): - n = node.traverse(addnodes.toctree)[0] - if n.get('caption'): - sectname = n['caption'] + else: + toctree = next(iter(node.traverse(addnodes.toctree)), None) + if toctree and toctree.get('caption'): + sectname = toctree.get('caption') else: + # anonymous-only labels continue - else: - # anonymous-only labels - continue self.labels[name] = docname, labelid, sectname def add_object(self, objtype: str, name: str, docname: str, labelid: str) -> None: |