Merge branch '1.7'

1 files changed, 3 insertions, 2 deletions

diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py
index 21464bbe6..d66ebe89e 100644
--- a/sphinx/util/osutil.py
+++ b/sphinx/util/osutil.py
@@ -8,6 +8,7 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
+from __future__ import absolute_import
 from __future__ import print_function
 
 import contextlib
@@ -22,13 +23,13 @@ import time
 import warnings
 from io import BytesIO, StringIO
 from os import path
+from typing import TYPE_CHECKING
 
 from six import PY2, PY3, text_type
 
 from sphinx.deprecation import RemovedInSphinx30Warning
 
-if False:
-    # For type annotation
+if TYPE_CHECKING:
     from typing import Any, Iterator, List, Tuple, Union  # NOQA
 
 # Errnos that we need.