summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sphinx/__init__.py2
-rw-r--r--sphinx/builders/devhelp.py1
-rw-r--r--sphinx/builders/gettext.py2
-rw-r--r--sphinx/cmd/quickstart.py1
-rw-r--r--sphinx/cmdline.py1
-rw-r--r--sphinx/ext/doctest.py1
-rw-r--r--sphinx/util/__init__.py1
-rw-r--r--sphinx/util/compat.py2
-rw-r--r--sphinx/util/docfields.py1
-rw-r--r--sphinx/util/docutils.py1
-rw-r--r--sphinx/util/fileutil.py1
-rw-r--r--sphinx/util/images.py1
-rw-r--r--sphinx/util/inspect.py1
-rw-r--r--sphinx/util/logging.py1
-rw-r--r--sphinx/util/nodes.py1
-rw-r--r--sphinx/util/parallel.py1
-rw-r--r--sphinx/util/requests.py2
-rw-r--r--sphinx/util/rst.py1
-rw-r--r--sphinx/util/smartypants.py1
-rw-r--r--sphinx/util/texescape.py2
-rw-r--r--tests/roots/test-ext-autodoc/target/enum.py1
-rw-r--r--tests/roots/test-ext-viewcode-find/not_a_package/__init__.py1
-rw-r--r--tests/roots/test-ext-viewcode/spam/__init__.py2
-rwxr-xr-xutils/bump_version.py2
24 files changed, 1 insertions, 30 deletions
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index ac5a91a97..9711863ce 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -12,8 +12,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
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index 13abf6b3b..1755b54eb 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -10,7 +10,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
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index d4407b305..642c2be75 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -9,8 +9,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
diff --git a/sphinx/cmd/quickstart.py b/sphinx/cmd/quickstart.py
index 5695821ab..c1e19e223 100644
--- a/sphinx/cmd/quickstart.py
+++ b/sphinx/cmd/quickstart.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 argparse
import locale
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index 545ae4e47..798607166 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.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 sys
import warnings
diff --git a/sphinx/ext/doctest.py b/sphinx/ext/doctest.py
index 097550cd3..729abfea5 100644
--- a/sphinx/ext/doctest.py
+++ b/sphinx/ext/doctest.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 doctest
import re
diff --git a/sphinx/util/__init__.py b/sphinx/util/__init__.py
index 3a89e60e5..4c319a071 100644
--- a/sphinx/util/__init__.py
+++ b/sphinx/util/__init__.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 fnmatch
import os
diff --git a/sphinx/util/compat.py b/sphinx/util/compat.py
index e1af4612a..144093ab4 100644
--- a/sphinx/util/compat.py
+++ b/sphinx/util/compat.py
@@ -9,8 +9,6 @@
:license: BSD, see LICENSE for details.
"""
-from __future__ import absolute_import
-
import sys
import warnings
diff --git a/sphinx/util/docfields.py b/sphinx/util/docfields.py
index 885e5eb2d..f6e07af74 100644
--- a/sphinx/util/docfields.py
+++ b/sphinx/util/docfields.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
from typing import List, Tuple, cast
diff --git a/sphinx/util/docutils.py b/sphinx/util/docutils.py
index 9e2ee740a..db0ff5ed5 100644
--- a/sphinx/util/docutils.py
+++ b/sphinx/util/docutils.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 os
import re
diff --git a/sphinx/util/fileutil.py b/sphinx/util/fileutil.py
index ecce46c76..fae393d6d 100644
--- a/sphinx/util/fileutil.py
+++ b/sphinx/util/fileutil.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 os
import posixpath
diff --git a/sphinx/util/images.py b/sphinx/util/images.py
index 80ab52d3a..4c94af881 100644
--- a/sphinx/util/images.py
+++ b/sphinx/util/images.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 base64
import imghdr
diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
index 8a1181f1a..ca7af28fa 100644
--- a/sphinx/util/inspect.py
+++ b/sphinx/util/inspect.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 builtins
import enum
diff --git a/sphinx/util/logging.py b/sphinx/util/logging.py
index b1fb05070..a82848921 100644
--- a/sphinx/util/logging.py
+++ b/sphinx/util/logging.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 logging
import logging.handlers
diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py
index e01c1490f..568024a53 100644
--- a/sphinx/util/nodes.py
+++ b/sphinx/util/nodes.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 re
from typing import Any, cast
diff --git a/sphinx/util/parallel.py b/sphinx/util/parallel.py
index d847fa163..f71954d84 100644
--- a/sphinx/util/parallel.py
+++ b/sphinx/util/parallel.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 os
import time
diff --git a/sphinx/util/requests.py b/sphinx/util/requests.py
index 3a3c2b6cb..9c79f8736 100644
--- a/sphinx/util/requests.py
+++ b/sphinx/util/requests.py
@@ -9,8 +9,6 @@
:license: BSD, see LICENSE for details.
"""
-from __future__ import absolute_import
-
import warnings
from contextlib import contextmanager
from urllib.parse import urlsplit
diff --git a/sphinx/util/rst.py b/sphinx/util/rst.py
index 097e93c74..d3a1c41df 100644
--- a/sphinx/util/rst.py
+++ b/sphinx/util/rst.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 re
from contextlib import contextmanager
diff --git a/sphinx/util/smartypants.py b/sphinx/util/smartypants.py
index b4f2be0a0..e2e2ef2c0 100644
--- a/sphinx/util/smartypants.py
+++ b/sphinx/util/smartypants.py
@@ -25,7 +25,6 @@
See the LICENSE file and the original docutils code for details.
"""
-from __future__ import absolute_import, unicode_literals
import re
diff --git a/sphinx/util/texescape.py b/sphinx/util/texescape.py
index 4d5b9b136..fa5055c0f 100644
--- a/sphinx/util/texescape.py
+++ b/sphinx/util/texescape.py
@@ -9,8 +9,6 @@
:license: BSD, see LICENSE for details.
"""
-from __future__ import unicode_literals
-
if False:
# For type annotation
from typing import Dict # NOQA
diff --git a/tests/roots/test-ext-autodoc/target/enum.py b/tests/roots/test-ext-autodoc/target/enum.py
index 31e7c6ccd..d0a59c71c 100644
--- a/tests/roots/test-ext-autodoc/target/enum.py
+++ b/tests/roots/test-ext-autodoc/target/enum.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import enum
diff --git a/tests/roots/test-ext-viewcode-find/not_a_package/__init__.py b/tests/roots/test-ext-viewcode-find/not_a_package/__init__.py
index 4a1d689e5..96e00169b 100644
--- a/tests/roots/test-ext-viewcode-find/not_a_package/__init__.py
+++ b/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
diff --git a/tests/roots/test-ext-viewcode/spam/__init__.py b/tests/roots/test-ext-viewcode/spam/__init__.py
index dffa85b91..2d5ca8239 100644
--- a/tests/roots/test-ext-viewcode/spam/__init__.py
+++ b/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
diff --git a/utils/bump_version.py b/utils/bump_version.py
index 55da12551..79a1fe6a7 100755
--- a/utils/bump_version.py
+++ b/utils/bump_version.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-from __future__ import print_function
-
import argparse
import os
import re
View Lorry Controller Status