Merge pull request #4933 from tk0miya/mypy-0.600

Mypy 0.600

setup.cfg

@@ -51,6 +51,7 @@ follow_imports = skip
 incremental = True
 check_untyped_defs = True
 warn_unused_ignores = True
+strict_optional = False
 
 [tool:pytest]
 filterwarnings =

sphinx/ext/inheritance_diagram.py

@@ -239,7 +239,7 @@ class InheritanceGraph(object):
     def get_all_class_names(self):
         # type: () -> List[unicode]
         """Get all of the class names involved in the graph."""
-        return [fullname for (_, fullname, _, _) in self.class_info]  # type: ignore
+        return [fullname for (_, fullname, _, _) in self.class_info]
 
     # These are the default attrs for graphviz
     default_graph_attrs = {

sphinx/setup_command.py

@@ -16,7 +16,7 @@ from __future__ import print_function
 import os
 import sys
 from distutils.cmd import Command
-from distutils.errors import DistutilsOptionError, DistutilsExecError  # type: ignore
+from distutils.errors import DistutilsOptionError, DistutilsExecError
 
 from six import StringIO, string_types