Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 9 insertions, 10 deletions

diff --git a/sphinx/domains/math.py b/sphinx/domains/math.py
index 89fc8c357..b1d23ec74 100644
--- a/sphinx/domains/math.py
+++ b/sphinx/domains/math.py
@@ -26,7 +26,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
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +45,7 @@ class MathDomain(Domain):
     initial_data = {
         'objects': {},  # labelid -> (docname, eqno)
         'has_equations': {},  # docname -> bool
-    }  # type: Dict[unicode, Dict[unicode, Tuple[unicode, int]]]
+    }  # type: Dict[str, Dict[str, Tuple[str, int]]]
     dangling_warnings = {
         'eq': 'equation not found: %(target)s',
     }
@@ -59,7 +58,7 @@ class MathDomain(Domain):
     }
 
     def process_doc(self, env, docname, document):
-        # type: (BuildEnvironment, unicode, nodes.document) -> None
+        # type: (BuildEnvironment, str, nodes.document) -> None
         def math_node(node):
             # type: (nodes.Node) -> bool
             return isinstance(node, (nodes.math, nodes.math_block))
@@ -67,7 +66,7 @@ class MathDomain(Domain):
         self.data['has_equations'][docname] = any(document.traverse(math_node))
 
     def clear_doc(self, docname):
-        # type: (unicode) -> None
+        # type: (str) -> None
         for equation_id, (doc, eqno) in list(self.data['objects'].items()):
             if doc == docname:
                 del self.data['objects'][equation_id]
@@ -75,7 +74,7 @@ class MathDomain(Domain):
         self.data['has_equations'].pop(docname, None)
 
     def merge_domaindata(self, docnames, otherdata):
-        # type: (Iterable[unicode], Dict) -> None
+        # type: (Iterable[str], Dict) -> None
         for labelid, (doc, eqno) in otherdata['objects'].items():
             if doc in docnames:
                 self.data['objects'][labelid] = (doc, eqno)
@@ -84,7 +83,7 @@ class MathDomain(Domain):
             self.data['has_equations'][docname] = otherdata['has_equations'][docname]
 
     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
         assert typ in ('eq', 'numref')
         docname, number = self.data['objects'].get(target, (None, None))
         if docname:
@@ -109,7 +108,7 @@ class MathDomain(Domain):
             return None
 
     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
         refnode = self.resolve_xref(env, fromdocname, builder, 'eq', target, node, contnode)
         if refnode is None:
             return []
@@ -121,7 +120,7 @@ class MathDomain(Domain):
         return []
 
     def add_equation(self, env, docname, labelid):
-        # type: (BuildEnvironment, unicode, unicode) -> int
+        # type: (BuildEnvironment, str, str) -> int
         equations = self.data['objects']
         if labelid in equations:
             path = env.doc2path(equations[labelid][0])
@@ -133,7 +132,7 @@ class MathDomain(Domain):
             return eqno
 
     def get_next_equation_number(self, docname):
-        # type: (unicode) -> int
+        # type: (str) -> int
         targets = [eq for eq in self.data['objects'].values() if eq[0] == docname]
         return len(targets) + 1
 
@@ -143,7 +142,7 @@ class MathDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.add_domain(MathDomain)
     app.add_role('eq', MathReferenceRole(warn_dangling=True))