diff options
author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
---|---|---|
committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-01-31 20:40:56 +0900 |
commit | 4647fcee456378c5001fe5ccbe7bff71fb799bf7 (patch) | |
tree | f3ff5f85e45bd79979ddae5af2c157bdfeaa5001 /sphinx/domains/javascript.py | |
parent | 5b7432b1ab333e4fe503b08d57732da1e5a25cf3 (diff) | |
parent | 280d2c79f835da6245c45523960b6ddf6f0088e0 (diff) | |
download | sphinx-git-4647fcee456378c5001fe5ccbe7bff71fb799bf7.tar.gz |
Merge branch '1.7-release'
Diffstat (limited to 'sphinx/domains/javascript.py')
-rw-r--r-- | sphinx/domains/javascript.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py index 85954613a..8c1e48fbb 100644 --- a/sphinx/domains/javascript.py +++ b/sphinx/domains/javascript.py @@ -13,13 +13,13 @@ from docutils import nodes from docutils.parsers.rst import Directive, directives from sphinx import addnodes +from sphinx.directives import ObjectDescription from sphinx.domains import Domain, ObjType +from sphinx.domains.python import _pseudo_parse_arglist from sphinx.locale import l_, _ -from sphinx.directives import ObjectDescription from sphinx.roles import XRefRole -from sphinx.domains.python import _pseudo_parse_arglist -from sphinx.util.nodes import make_refnode from sphinx.util.docfields import Field, GroupedField, TypedField +from sphinx.util.nodes import make_refnode if False: # For type annotation |