Merge branch '2.0'

1 files changed, 7 insertions, 17 deletions

diff --git a/sphinx/util/images.py b/sphinx/util/images.py
index 76bffd88c..8471e56df 100644
--- a/sphinx/util/images.py
+++ b/sphinx/util/images.py
@@ -12,7 +12,7 @@ import base64
 import imghdr
 from collections import OrderedDict
 from os import path
-from typing import NamedTuple
+from typing import IO, NamedTuple, Tuple
 
 import imagesize
 
@@ -21,10 +21,6 @@ try:
 except ImportError:
     Image = None
 
-if False:
-    # For type annotation
-    from typing import IO, Tuple  # NOQA
-
 mime_suffixes = OrderedDict([
     ('.gif', 'image/gif'),
     ('.jpg', 'image/jpeg'),
@@ -39,8 +35,7 @@ DataURI = NamedTuple('DataURI', [('mimetype', str),
                                  ('data', bytes)])
 
 
-def get_image_size(filename):
-    # type: (str) -> Tuple[int, int]
+def get_image_size(filename: str) -> Tuple[int, int]:
     try:
         size = imagesize.get(filename)
         if size[0] == -1:
@@ -59,8 +54,7 @@ def get_image_size(filename):
         return None
 
 
-def guess_mimetype_for_stream(stream, default=None):
-    # type: (IO, str) -> str
+def guess_mimetype_for_stream(stream: IO, default: str = None) -> str:
     imgtype = imghdr.what(stream)  # type: ignore
     if imgtype:
         return 'image/' + imgtype
@@ -68,8 +62,7 @@ def guess_mimetype_for_stream(stream, default=None):
         return default
 
 
-def guess_mimetype(filename, default=None):
-    # type: (str, str) -> str
+def guess_mimetype(filename: str = '', default: str = None) -> str:
     _, ext = path.splitext(filename.lower())
     if ext in mime_suffixes:
         return mime_suffixes[ext]
@@ -80,8 +73,7 @@ def guess_mimetype(filename, default=None):
     return default
 
 
-def get_image_extension(mimetype):
-    # type: (str) -> str
+def get_image_extension(mimetype: str) -> str:
     for ext, _mimetype in mime_suffixes.items():
         if mimetype == _mimetype:
             return ext
@@ -89,8 +81,7 @@ def get_image_extension(mimetype):
     return None
 
 
-def parse_data_uri(uri):
-    # type: (str) -> DataURI
+def parse_data_uri(uri: str) -> DataURI:
     if not uri.startswith('data:'):
         return None
 
@@ -111,8 +102,7 @@ def parse_data_uri(uri):
     return DataURI(mimetype, charset, image_data)
 
 
-def test_svg(h, f):
-    # type: (bytes, IO) -> str
+def test_svg(h: bytes, f: IO) -> str:
     """An additional imghdr library helper; test the header is SVG's or not."""
     try:
         if '<svg' in h.decode().lower():