Update type annotations

22 files changed, 24 insertions, 24 deletions

diff --git a/sphinx/builders/applehelp.py b/sphinx/builders/applehelp.py
index 66ee82ff8..3c2782802 100644
--- a/sphinx/builders/applehelp.py
+++ b/sphinx/builders/applehelp.py
@@ -30,6 +30,7 @@ import subprocess
 
 if False:
     # For type annotation
+    from typing import Any  # NOQA
     from sphinx.application import Sphinx  # NOQA
 
 # Use plistlib.dump in 3.4 and above
@@ -271,7 +272,7 @@ class AppleHelpBuilder(StandaloneHTMLBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.setup_extension('sphinx.builders.html')
     app.add_builder(AppleHelpBuilder)
 
diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py
index 708cefcde..1140f854a 100644
--- a/sphinx/builders/changes.py
+++ b/sphinx/builders/changes.py
@@ -165,7 +165,7 @@ class ChangesBuilder(Builder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(ChangesBuilder)
 
     return {
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index e615de39b..f1ed3a495 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -132,7 +132,7 @@ class DevhelpBuilder(StandaloneHTMLBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.setup_extension('sphinx.builders.html')
     app.add_builder(DevhelpBuilder)
 
diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py
index d119c62db..5d4686af6 100644
--- a/sphinx/builders/epub.py
+++ b/sphinx/builders/epub.py
@@ -838,7 +838,7 @@ class EpubBuilder(StandaloneHTMLBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.setup_extension('sphinx.builders.html')
     app.add_builder(EpubBuilder)
 
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index ecf8cb1f3..ced63e8f5 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -277,7 +277,7 @@ class MessageCatalogBuilder(I18nBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(MessageCatalogBuilder)
 
     app.add_config_value('gettext_compact', True, 'gettext')
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 5e1608132..e64f4e5a4 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -1275,7 +1275,7 @@ def validate_config_values(app):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     # builders
     app.add_builder(StandaloneHTMLBuilder)
     app.add_builder(DirectoryHTMLBuilder)
diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py
index 53269da07..c8e1449f9 100644
--- a/sphinx/builders/latex.py
+++ b/sphinx/builders/latex.py
@@ -286,7 +286,7 @@ def validate_config_values(app):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(LaTeXBuilder)
     app.connect('builder-inited', validate_config_values)
 
diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py
index dbb60b344..0b95bcd6c 100644
--- a/sphinx/builders/linkcheck.py
+++ b/sphinx/builders/linkcheck.py
@@ -310,7 +310,7 @@ class CheckExternalLinksBuilder(Builder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(CheckExternalLinksBuilder)
 
     app.add_config_value('linkcheck_ignore', [], None)
diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py
index f688a38d9..e6f7c4104 100644
--- a/sphinx/builders/manpage.py
+++ b/sphinx/builders/manpage.py
@@ -103,7 +103,7 @@ class ManualPageBuilder(Builder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(ManualPageBuilder)
 
     app.add_config_value('man_pages',
diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
index d8f43ea45..c49f3d767 100644
--- a/sphinx/builders/qthelp.py
+++ b/sphinx/builders/qthelp.py
@@ -318,7 +318,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.setup_extension('sphinx.builders.html')
     app.add_builder(QtHelpBuilder)
 
diff --git a/sphinx/builders/texinfo.py b/sphinx/builders/texinfo.py
index eee4f931a..354575157 100644
--- a/sphinx/builders/texinfo.py
+++ b/sphinx/builders/texinfo.py
@@ -242,7 +242,7 @@ class TexinfoBuilder(Builder):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_builder(TexinfoBuilder)
 
     app.add_config_value('texinfo_documents',
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index 6c1081624..58efd68a5 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -242,7 +242,7 @@ class DefaultDomain(Directive):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     directives.register_directive('default-role', DefaultRole)
     directives.register_directive('default-domain', DefaultDomain)
     directives.register_directive('describe', ObjectDescription)
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index c6280b927..03936f4e8 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -389,7 +389,7 @@ class LiteralInclude(Directive):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     directives.register_directive('highlight', Highlight)
     directives.register_directive('highlightlang', Highlight)  # old
     directives.register_directive('code-block', CodeBlock)
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index 1bdef5ebc..3dcd3c60b 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -427,7 +427,7 @@ class Include(BaseInclude):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     directives.register_directive('toctree', TocTree)
     directives.register_directive('sectionauthor', Author)
     directives.register_directive('moduleauthor', Author)
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py
index a9655c661..22b221318 100644
--- a/sphinx/domains/c.py
+++ b/sphinx/domains/c.py
@@ -325,7 +325,7 @@ class CDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(CDomain)
 
     return {
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index a676296fb..9e702e4e7 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -4987,7 +4987,7 @@ class CPPDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(CPPDomain)
     app.add_config_value("cpp_index_common_prefix", [], 'env')
     app.add_config_value("cpp_id_attributes", [], 'env')
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index a2c10af94..6d7920411 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -20,7 +20,7 @@ from sphinx.util.docfields import Field, GroupedField, TypedField
 
 if False:
     # For type annotation
-    from typing import Iterator, Tuple  # NOQA
+    from typing import Any, Iterator, Tuple  # NOQA
     from docutils import nodes  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
@@ -255,7 +255,7 @@ class JavaScriptDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(JavaScriptDomain)
 
     return {
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index b6c2f4e99..562c0be3d 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -841,7 +841,7 @@ class PythonDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(PythonDomain)
 
     return {
diff --git a/sphinx/domains/rst.py b/sphinx/domains/rst.py
index b433e83c6..450b0faa2 100644
--- a/sphinx/domains/rst.py
+++ b/sphinx/domains/rst.py
@@ -22,7 +22,7 @@ from sphinx.util.nodes import make_refnode
 
 if False:
     # For type annotation
-    from typing import Iterator, Tuple  # NOQA
+    from typing import Any, Iterator, Tuple  # NOQA
     from docutils import nodes  # NOQA
     from sphinx.application import Sphinx  # NOQA
     from sphinx.builders import Builder  # NOQA
@@ -177,7 +177,7 @@ class ReSTDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(ReSTDomain)
 
     return {
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index b980602f1..359690239 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -909,7 +909,7 @@ class StandardDomain(Domain):
 
 
 def setup(app):
-    # type: (Sphinx) -> None
+    # type: (Sphinx) -> Dict[unicode, Any]
     app.add_domain(StandardDomain)
 
     return {
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index d3dfbe5e1..aed6aa1f7 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -166,7 +166,7 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
                     template = template_env.get_template('autosummary/base.rst')
 
             def get_members(obj, typ, include_public=[], imported=False):
-                # type: (Any, unicode, List[unicode]) -> Tuple[List[unicode], List[unicode]]
+                # type: (Any, unicode, List[unicode], bool) -> Tuple[List[unicode], List[unicode]]
                 items = []  # type: List[unicode]
                 for name in dir(obj):
                     try:
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index 73b68f5a2..a9348ce75 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -47,7 +47,6 @@ def make_admonition(node_class, name, arguments, options, content, lineno,
 
 class _DeprecationWrapper(object):
     def __init__(self, mod, deprecated):
-        # type: (Any, Dict) -> None
         self._mod = mod
         self._deprecated = deprecated