Merge pull request #5509 from stephenfin/remove-future-imports

Remove future imports

sphinx/__init__.py

@@ -11,8 +11,6 @@
 # Keep this file executable as-is in Python 3!
 # (Otherwise getting the version out of it from setup.py is impossible.)
 
-from __future__ import absolute_import
-
 import os
 import warnings
 from os import path

sphinx/builders/devhelp.py

@@ -9,7 +9,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import gzip
 import re

sphinx/builders/gettext.py

@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import unicode_literals
-
 from codecs import open
 from collections import defaultdict, OrderedDict
 from datetime import datetime, tzinfo, timedelta

sphinx/cmd/quickstart.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import argparse
 import locale

sphinx/cmdline.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import sys
 import warnings

sphinx/ext/doctest.py

@@ -8,7 +8,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import doctest
 import re

sphinx/util/__init__.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import fnmatch
 import os

sphinx/util/compat.py

@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import absolute_import
-
 import sys
 import warnings
 

sphinx/util/docfields.py

@@ -8,7 +8,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 from typing import List, Tuple, cast
 

sphinx/util/docutils.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import os
 import re

sphinx/util/fileutil.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import os
 import posixpath

sphinx/util/images.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import base64
 import imghdr

sphinx/util/inspect.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import builtins
 import enum

sphinx/util/logging.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import logging
 import logging.handlers

sphinx/util/nodes.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import re
 from typing import Any, cast

sphinx/util/parallel.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import os
 import time

sphinx/util/requests.py

@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import absolute_import
-
 import warnings
 from contextlib import contextmanager
 from urllib.parse import urlsplit

sphinx/util/rst.py

@@ -7,7 +7,6 @@
     :copyright: Copyright 2007-2018 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
-from __future__ import absolute_import
 
 import re
 from contextlib import contextmanager

sphinx/util/smartypants.py

@@ -24,7 +24,6 @@
     See the LICENSE file and the original docutils code for details.
 
 """
-from __future__ import absolute_import, unicode_literals
 
 import re
 

sphinx/util/texescape.py

@@ -8,8 +8,6 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import unicode_literals
-
 if False:
     # For type annotation
     from typing import Dict  # NOQA

tests/roots/test-apidoc-toc/mypackage/main.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
 import os
 
 import mod_resource

tests/roots/test-ext-autodoc/target/enum.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import enum
 
 

tests/roots/test-ext-viewcode-find/not_a_package/__init__.py

@@ -1,3 +1,4 @@
+# TODO(stephenfin): Removing this breaks tests. Why?
 from __future__ import absolute_import
 
 from .submodule import func1, Class1  # NOQA

tests/roots/test-ext-viewcode/spam/__init__.py

@@ -1,4 +1,2 @@
-from __future__ import absolute_import
-
 from .mod1 import func1, Class1  # NOQA
 from .mod2 import func2, Class2  # NOQA

utils/bump_version.py

@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import argparse
 import os

utils/checks.py

@@ -59,7 +59,7 @@ def sphinx_has_header(physical_line, filename, lines, line_number):
 
     # line number correction
     offset = 1
-    if lines[0:1] == ['#!/usr/bin/env python\n']:
+    if lines[0:1] == ['#!/usr/bin/env python3\n']:
         lines = lines[1:]
         offset = 2