diff options
| author | Georg Brandl <georg@python.org> | 2011-09-23 11:03:23 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-23 11:03:23 +0200 |
| commit | 4abbe95a9c6b82ec644ea7fc81fd0198edf7831e (patch) | |
| tree | 370b12cba4f2d19a7405c4efef31c408108def8f /sphinx/domains/javascript.py | |
| parent | 25d41d8ed10aed0d8f497679f7426cecb429ac20 (diff) | |
| parent | 69f7e0768114fde9ccabc4bf7d56f765743612a6 (diff) | |
| download | sphinx-git-4abbe95a9c6b82ec644ea7fc81fd0198edf7831e.tar.gz | |
Merge with 1.0
Diffstat (limited to 'sphinx/domains/javascript.py')
| -rw-r--r-- | sphinx/domains/javascript.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py index 09d555add..a6f4e87cc 100644 --- a/sphinx/domains/javascript.py +++ b/sphinx/domains/javascript.py @@ -86,12 +86,11 @@ class JSObject(ObjectDescription): self.state.document.note_explicit_target(signode) objects = self.env.domaindata['js']['objects'] if fullname in objects: - self.env.warn( - self.env.docname, + self.state_machine.reporter.warning( 'duplicate object description of %s, ' % fullname + 'other instance in ' + self.env.doc2path(objects[fullname][0]), - self.lineno) + line=self.lineno) objects[fullname] = self.env.docname, self.objtype indextext = self.get_index_text(objectname, name_obj) |