Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 14 insertions, 15 deletions

diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index ca9930ac4..68bd045ef 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -29,7 +29,6 @@ if False:
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
 
 
 class JSObject(ObjectDescription):
@@ -41,14 +40,14 @@ class JSObject(ObjectDescription):
     has_arguments = False
 
     #: what is displayed right before the documentation entry
-    display_prefix = None  # type: unicode
+    display_prefix = None  # type: str
 
     #: If ``allow_nesting`` is ``True``, the object prefixes will be accumulated
     #: based on directive nesting
     allow_nesting = False
 
     def handle_signature(self, sig, signode):
-        # type: (unicode, addnodes.desc_signature) -> Tuple[unicode, unicode]
+        # type: (str, addnodes.desc_signature) -> Tuple[str, str]
         """Breaks down construct signatures
 
         Parses out prefix and argument list from construct definition. The
@@ -102,7 +101,7 @@ class JSObject(ObjectDescription):
         return fullname, prefix
 
     def add_target_and_index(self, name_obj, sig, signode):
-        # type: (Tuple[unicode, unicode], unicode, addnodes.desc_signature) -> None
+        # type: (Tuple[str, str], str, addnodes.desc_signature) -> None
         mod_name = self.env.ref_context.get('js:module')
         fullname = (mod_name and mod_name + '.' or '') + name_obj[0]
         if fullname not in self.state.document.ids:
@@ -126,7 +125,7 @@ class JSObject(ObjectDescription):
                                               '', None))
 
     def get_index_text(self, objectname, name_obj):
-        # type: (unicode, Tuple[unicode, unicode]) -> unicode
+        # type: (str, Tuple[str, str]) -> str
         name, obj = name_obj
         if self.objtype == 'function':
             if not obj:
@@ -273,7 +272,7 @@ class JSModule(SphinxDirective):
 
 class JSXRefRole(XRefRole):
     def process_link(self, env, refnode, has_explicit_title, title, target):
-        # type: (BuildEnvironment, nodes.Element, bool, unicode, unicode) -> Tuple[unicode, unicode]  # NOQA
+        # type: (BuildEnvironment, nodes.Element, bool, str, str) -> Tuple[str, str]
         # basically what sphinx.domains.python.PyXRefRole does
         refnode['js:object'] = env.ref_context.get('js:object')
         refnode['js:module'] = env.ref_context.get('js:module')
@@ -323,10 +322,10 @@ class JavaScriptDomain(Domain):
     initial_data = {
         'objects': {},  # fullname -> docname, objtype
         'modules': {},  # mod_name -> docname
-    }  # type: Dict[unicode, Dict[unicode, Tuple[unicode, unicode]]]
+    }  # type: Dict[str, Dict[str, Tuple[str, str]]]
 
     def clear_doc(self, docname):
-        # type: (unicode) -> None
+        # type: (str) -> None
         for fullname, (pkg_docname, _l) in list(self.data['objects'].items()):
             if pkg_docname == docname:
                 del self.data['objects'][fullname]
@@ -335,7 +334,7 @@ class JavaScriptDomain(Domain):
                 del self.data['modules'][mod_name]
 
     def merge_domaindata(self, docnames, otherdata):
-        # type: (List[unicode], Dict) -> None
+        # type: (List[str], Dict) -> None
         # XXX check duplicates
         for fullname, (fn, objtype) in otherdata['objects'].items():
             if fn in docnames:
@@ -345,7 +344,7 @@ class JavaScriptDomain(Domain):
                 self.data['modules'][mod_name] = pkg_docname
 
     def find_obj(self, env, mod_name, prefix, name, typ, searchorder=0):
-        # type: (BuildEnvironment, unicode, unicode, unicode, unicode, int) -> Tuple[unicode, Tuple[unicode, unicode]]  # NOQA
+        # type: (BuildEnvironment, str, str, str, str, int) -> Tuple[str, Tuple[str, str]]
         if name[-2:] == '()':
             name = name[:-2]
         objects = self.data['objects']
@@ -371,7 +370,7 @@ class JavaScriptDomain(Domain):
 
     def resolve_xref(self, env, fromdocname, builder, typ, target, node,
                      contnode):
-        # type: (BuildEnvironment, unicode, Builder, unicode, unicode, addnodes.pending_xref, nodes.Element) -> nodes.Element  # NOQA
+        # type: (BuildEnvironment, str, Builder, str, str, addnodes.pending_xref, nodes.Element) -> nodes.Element  # NOQA
         mod_name = node.get('js:module')
         prefix = node.get('js:object')
         searchorder = node.hasattr('refspecific') and 1 or 0
@@ -383,7 +382,7 @@ class JavaScriptDomain(Domain):
 
     def resolve_any_xref(self, env, fromdocname, builder, target, node,
                          contnode):
-        # type: (BuildEnvironment, unicode, Builder, unicode, addnodes.pending_xref, nodes.Element) -> List[Tuple[unicode, nodes.Element]]  # NOQA
+        # type: (BuildEnvironment, str, Builder, str, addnodes.pending_xref, nodes.Element) -> List[Tuple[str, nodes.Element]]  # NOQA
         mod_name = node.get('js:module')
         prefix = node.get('js:object')
         name, obj = self.find_obj(env, mod_name, prefix, target, None, 1)
@@ -394,13 +393,13 @@ class JavaScriptDomain(Domain):
                               name.replace('$', '_S_'), contnode, name))]
 
     def get_objects(self):
-        # type: () -> Iterator[Tuple[unicode, unicode, unicode, unicode, unicode, int]]
+        # type: () -> Iterator[Tuple[str, str, str, str, str, int]]
         for refname, (docname, type) in list(self.data['objects'].items()):
             yield refname, refname, type, docname, \
                 refname.replace('$', '_S_'), 1
 
     def get_full_qualified_name(self, node):
-        # type: (nodes.Element) -> unicode
+        # type: (nodes.Element) -> str
         modname = node.get('js:module')
         prefix = node.get('js:object')
         target = node.get('reftarget')
@@ -411,7 +410,7 @@ class JavaScriptDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.add_domain(JavaScriptDomain)
 
     return {