From d2ed2d4c4c44fa2009bfdf536a85eeda0c6b72f2 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 24 Apr 2018 01:09:34 +0900 Subject: [PATCH] Fix #4885: jsdomain also crashed with duplicated objects --- CHANGES | 2 +- sphinx/domains/javascript.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 856d23e8b..5456397ca 100644 --- a/CHANGES +++ b/CHANGES @@ -16,7 +16,7 @@ Features added Bugs fixed ---------- -* #4885, #4887: py domain: Crashed with duplicated objects +* #4885, #4887: domains: Crashed with duplicated objects Testing -------- diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py index e64177cdc..eca7edda0 100644 --- a/sphinx/domains/javascript.py +++ b/sphinx/domains/javascript.py @@ -262,7 +262,7 @@ class JSModule(Directive): if mod_name in modules: self.state_machine.reporter.warning( 'duplicate module description of %s, ' % mod_name + - 'other instance in ' + self.env.doc2path(modules[mod_name]), + 'other instance in ' + env.doc2path(modules[mod_name]), line=self.lineno) env.domaindata['js']['modules'][mod_name] = env.docname # Make a duplicate entry in 'objects' to facilitate searching for