summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi KOMIYA <i.tkomiya@gmail.com>2019-02-01 22:35:52 +0900
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2019-02-01 22:35:52 +0900
commit98863e961a714d7eb41b808fb73125b34d10acdd (patch)
tree17947d676ffbd1b00987efc6e81fd937884d6863
parent97d99f830258a4612a6c77f5be084819634dcbad (diff)
parentc577f85846fb016bb87f4d5c3fa5effe9f45722e (diff)
downloadsphinx-git-98863e961a714d7eb41b808fb73125b34d10acdd.tar.gz
Merge branch '1.8'
-rw-r--r--sphinx/util/inventory.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/sphinx/util/inventory.py b/sphinx/util/inventory.py
index 1a739bf21..786898181 100644
--- a/sphinx/util/inventory.py
+++ b/sphinx/util/inventory.py
@@ -136,11 +136,11 @@ class InventoryFile:
if not m:
continue
name, type, prio, location, dispname = m.groups()
- if type == 'py:module' and type in invdata and \
- name in invdata[type]: # due to a bug in 1.1 and below,
- # two inventory entries are created
- # for Python modules, and the first
- # one is correct
+ if type == 'py:module' and type in invdata and name in invdata[type]:
+ # due to a bug in 1.1 and below,
+ # two inventory entries are created
+ # for Python modules, and the first
+ # one is correct
continue
if location.endswith('$'):
location = location[:-1] + name