From b1abd4629bf1c6bfb244ffa349f76f996ee06e14 Mon Sep 17 00:00:00 2001 From: shimizukawa Date: Thu, 8 Dec 2016 00:34:19 +0900 Subject: [PATCH] Fix#3198: AttributeError is raised when toctree has 'self'. this regression introduced at dc985ed4. --- CHANGES | 3 ++- sphinx/environment/managers/toctree.py | 2 +- tests/root/contents.txt | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 6a70f99a1..077345a6b 100644 --- a/CHANGES +++ b/CHANGES @@ -4,7 +4,8 @@ Release 1.5.1 (in development) Bugs fixed ---------- -* #3195: Can not build in parallel. +* #3195: Can not build in parallel +* #3198: AttributeError is raised when toctree has 'self' Release 1.5 (released Dec 5, 2016) diff --git a/sphinx/environment/managers/toctree.py b/sphinx/environment/managers/toctree.py index d4848a72c..e96143754 100644 --- a/sphinx/environment/managers/toctree.py +++ b/sphinx/environment/managers/toctree.py @@ -270,7 +270,7 @@ class Toctree(EnvironmentManager): # toctree originates ref = toctreenode['parent'] if not title: - title = clean_astext(self.titles[ref]) + title = clean_astext(self.env.titles[ref]) reference = nodes.reference('', '', internal=True, refuri=ref, anchorname='', diff --git a/tests/root/contents.txt b/tests/root/contents.txt index ce0e5d3fa..d5ff24115 100644 --- a/tests/root/contents.txt +++ b/tests/root/contents.txt @@ -34,6 +34,8 @@ Contents: Latest reference Python + self + Indices and tables ==================