summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES17
-rw-r--r--sphinx/ext/viewcode.py6
2 files changed, 16 insertions, 7 deletions
diff --git a/CHANGES b/CHANGES
index 0b73e301b..1067d3fda 100644
--- a/CHANGES
+++ b/CHANGES
@@ -117,7 +117,7 @@ Testing
* Add support for docutils 0.14
-Release 1.6.6 (in development)
+Release 1.6.7 (in development)
==============================
Dependencies
@@ -132,6 +132,18 @@ Deprecated
Features added
--------------
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 1.6.6 (released Jan 08, 2018)
+=====================================
+
+Features added
+--------------
+
* #4181: autodoc: Sort dictionary keys when possible
* ``VerbatimHighlightColor`` is a new
:ref:`LaTeX 'sphinxsetup' <latexsphinxsetup>` key (refs: #4285)
@@ -165,9 +177,6 @@ Bugs fixed
* Fix links to external option docs with intersphinx (refs: #3769)
* #4091: Private members not documented without :undoc-members:
-Testing
---------
-
Release 1.6.5 (released Oct 23, 2017)
=====================================
diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py
index d4ff7cebb..757d7adc0 100644
--- a/sphinx/ext/viewcode.py
+++ b/sphinx/ext/viewcode.py
@@ -71,12 +71,12 @@ def doctree_read(app, doctree):
code = analyzer.code.decode(analyzer.encoding)
else:
code = analyzer.code
- if entry is None or entry[0] != code:
+ if entry is False:
+ return
+ elif entry is None or entry[0] != code:
analyzer.find_tags()
entry = code, analyzer.tags, {}, refname
env._viewcode_modules[modname] = entry # type: ignore
- elif entry is False:
- return
_, tags, used, _ = entry
if fullname in tags:
used[fullname] = docname