Merge branch 'master' into 5770_doctest_refers_highlight_language

1 files changed, 14 insertions, 15 deletions

diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py
index ab3cc4d0f..c315ba8d3 100644
--- a/sphinx/ext/inheritance_diagram.py
+++ b/sphinx/ext/inheritance_diagram.py
@@ -59,7 +59,6 @@ if False:
     from typing import Any, Dict, List, Tuple, Dict, Optional  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.environment import BuildEnvironment  # NOQA
-    from sphinx.util.typing import unicode  # NOQA
     from sphinx.writers.html import HTMLTranslator  # NOQA
     from sphinx.writers.latex import LaTeXTranslator  # NOQA
     from sphinx.writers.texinfo import TexinfoTranslator  # NOQA
@@ -71,7 +70,7 @@ module_sig_re = re.compile(r'''^(?:([\w.]*)\.)?  # module names
 
 
 def try_import(objname):
-    # type: (unicode) -> Any
+    # type: (str) -> Any
     """Import a object or module using *name* and *currentmodule*.
     *name* should be a relative name from *currentmodule* or
     a fully-qualified name.
@@ -99,7 +98,7 @@ def try_import(objname):
 
 
 def import_classes(name, currmodule):
-    # type: (unicode, unicode) -> Any
+    # type: (str, str) -> Any
     """Import a class using its fully-qualified *name*."""
     target = None
 
@@ -142,7 +141,7 @@ class InheritanceGraph:
     """
     def __init__(self, class_names, currmodule, show_builtins=False,
                  private_bases=False, parts=0, aliases=None, top_classes=[]):
-        # type: (List[unicode], str, bool, bool, int, Optional[Dict[unicode, unicode]], List[Any]) -> None  # NOQA
+        # type: (List[str], str, bool, bool, int, Optional[Dict[str, str]], List[Any]) -> None
         """*class_names* is a list of child classes to show bases from.
 
         If *show_builtins* is True, then Python builtins will be shown
@@ -157,7 +156,7 @@ class InheritanceGraph:
                                        'inheritance diagram')
 
     def _import_classes(self, class_names, currmodule):
-        # type: (List[unicode], str) -> List[Any]
+        # type: (List[str], str) -> List[Any]
         """Import a list of classes."""
         classes = []  # type: List[Any]
         for name in class_names:
@@ -165,7 +164,7 @@ class InheritanceGraph:
         return classes
 
     def _class_info(self, classes, show_builtins, private_bases, parts, aliases, top_classes):
-        # type: (List[Any], bool, bool, int, Optional[Dict[unicode, unicode]], List[Any]) -> List[Tuple[unicode, unicode, List[unicode], unicode]]  # NOQA
+        # type: (List[Any], bool, bool, int, Optional[Dict[str, str]], List[Any]) -> List[Tuple[str, str, List[str], str]]  # NOQA
         """Return name and bases for all classes that are ancestors of
         *classes*.
 
@@ -198,7 +197,7 @@ class InheritanceGraph:
             except Exception:  # might raise AttributeError for strange classes
                 pass
 
-            baselist = []  # type: List[unicode]
+            baselist = []  # type: List[str]
             all_classes[cls] = (nodename, fullname, baselist, tooltip)
 
             if fullname in top_classes:
@@ -219,7 +218,7 @@ class InheritanceGraph:
         return list(all_classes.values())
 
     def class_name(self, cls, parts=0, aliases=None):
-        # type: (Any, int, Optional[Dict[unicode, unicode]]) -> unicode
+        # type: (Any, int, Optional[Dict[str, str]]) -> str
         """Given a class object, return a fully-qualified name.
 
         This works for things I've tested in matplotlib so far, but may not be
@@ -240,7 +239,7 @@ class InheritanceGraph:
         return result
 
     def get_all_class_names(self):
-        # type: () -> List[unicode]
+        # type: () -> List[str]
         """Get all of the class names involved in the graph."""
         return [fullname for (_, fullname, _, _) in self.class_info]
 
@@ -263,16 +262,16 @@ class InheritanceGraph:
     }
 
     def _format_node_attrs(self, attrs):
-        # type: (Dict) -> unicode
+        # type: (Dict) -> str
         return ','.join(['%s=%s' % x for x in sorted(attrs.items())])
 
     def _format_graph_attrs(self, attrs):
-        # type: (Dict) -> unicode
+        # type: (Dict) -> str
         return ''.join(['%s=%s;\n' % x for x in sorted(attrs.items())])
 
     def generate_dot(self, name, urls={}, env=None,
                      graph_attrs={}, node_attrs={}, edge_attrs={}):
-        # type: (unicode, Dict, BuildEnvironment, Dict, Dict, Dict) -> unicode
+        # type: (str, Dict, BuildEnvironment, Dict, Dict, Dict) -> str
         """Generate a graphviz dot graph from the classes that were passed in
         to __init__.
 
@@ -294,7 +293,7 @@ class InheritanceGraph:
             n_attrs.update(env.config.inheritance_node_attrs)
             e_attrs.update(env.config.inheritance_edge_attrs)
 
-        res = []  # type: List[unicode]
+        res = []  # type: List[str]
         res.append('digraph %s {\n' % name)
         res.append(self._format_graph_attrs(g_attrs))
 
@@ -389,7 +388,7 @@ class InheritanceDiagram(SphinxDirective):
 
 
 def get_graph_hash(node):
-    # type: (inheritance_diagram) -> unicode
+    # type: (inheritance_diagram) -> str
     encoded = (node['content'] + str(node['parts'])).encode('utf-8')
     return md5(encoded).hexdigest()[-10:]
 
@@ -466,7 +465,7 @@ def skip(self, node):
 
 
 def setup(app):
-    # type: (Sphinx) -> Dict[unicode, Any]
+    # type: (Sphinx) -> Dict[str, Any]
     app.setup_extension('sphinx.ext.graphviz')
     app.add_node(
         inheritance_diagram,