diff --git a/lldb/docs/conf.py b/lldb/docs/conf.py --- a/lldb/docs/conf.py +++ b/lldb/docs/conf.py @@ -10,8 +10,6 @@ # # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import print_function - import sys, os, re, shutil from datetime import date diff --git a/lldb/packages/Python/lldbsuite/support/gmodules.py b/lldb/packages/Python/lldbsuite/support/gmodules.py --- a/lldb/packages/Python/lldbsuite/support/gmodules.py +++ b/lldb/packages/Python/lldbsuite/support/gmodules.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import print_function - # System modules import os import re diff --git a/lldb/packages/Python/lldbsuite/test/__init__.py b/lldb/packages/Python/lldbsuite/test/__init__.py --- a/lldb/packages/Python/lldbsuite/test/__init__.py +++ b/lldb/packages/Python/lldbsuite/test/__init__.py @@ -1,7 +1,5 @@ # Module level initialization for the `lldbsuite.test` module. -from __future__ import absolute_import - from . import dotest run_suite = dotest.run_suite diff --git a/lldb/packages/Python/lldbsuite/test/bench.py b/lldb/packages/Python/lldbsuite/test/bench.py --- a/lldb/packages/Python/lldbsuite/test/bench.py +++ b/lldb/packages/Python/lldbsuite/test/bench.py @@ -12,9 +12,6 @@ ./bench.py -e /Volumes/data/lldb/svn/regression/build/Debug/lldb -x '-F Driver::MainLoop()' 2>&1 | grep -P '^lldb.*benchmark:' """ -from __future__ import print_function -from __future__ import absolute_import - import os from optparse import OptionParser diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -7,9 +7,6 @@ how this invocation of the test suite should be run. """ -from __future__ import absolute_import -from __future__ import print_function - # System modules import os diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py --- a/lldb/packages/Python/lldbsuite/test/decorators.py +++ b/lldb/packages/Python/lldbsuite/test/decorators.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # System modules from distutils.version import LooseVersion from functools import wraps diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -18,9 +18,6 @@ for available options. """ -from __future__ import absolute_import -from __future__ import print_function - # System modules import atexit import datetime diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # System modules import argparse import sys diff --git a/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py b/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py --- a/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py +++ b/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py @@ -11,9 +11,6 @@ Provides helper support for adding lldb test paths to the python path. """ -from __future__ import print_function -from __future__ import absolute_import - # System modules import os import platform diff --git a/lldb/packages/Python/lldbsuite/test/lldbbench.py b/lldb/packages/Python/lldbsuite/test/lldbbench.py --- a/lldb/packages/Python/lldbsuite/test/lldbbench.py +++ b/lldb/packages/Python/lldbsuite/test/lldbbench.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # System modules import time diff --git a/lldb/packages/Python/lldbsuite/test/lldbinline.py b/lldb/packages/Python/lldbsuite/test/lldbinline.py --- a/lldb/packages/Python/lldbsuite/test/lldbinline.py +++ b/lldb/packages/Python/lldbsuite/test/lldbinline.py @@ -1,6 +1,3 @@ -from __future__ import print_function -from __future__ import absolute_import - # System modules import os import textwrap diff --git a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py --- a/lldb/packages/Python/lldbsuite/test/lldbpexpect.py +++ b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - # System modules import os import sys diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatform.py b/lldb/packages/Python/lldbsuite/test/lldbplatform.py --- a/lldb/packages/Python/lldbsuite/test/lldbplatform.py +++ b/lldb/packages/Python/lldbsuite/test/lldbplatform.py @@ -1,7 +1,5 @@ """ This module represents an abstraction of an lldb target / host platform. """ -from __future__ import absolute_import - # System modules import itertools diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py --- a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py +++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py @@ -1,8 +1,6 @@ """ This module contains functions used by the test cases to hide the architecture and/or the platform dependent nature of the tests. """ -from __future__ import absolute_import - # System modules import itertools import re diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -27,9 +27,6 @@ $ """ -from __future__ import absolute_import -from __future__ import print_function - # System modules import abc from distutils.version import LooseVersion diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py --- a/lldb/packages/Python/lldbsuite/test/lldbutil.py +++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py @@ -4,9 +4,6 @@ They can also be useful for general purpose lldb scripting. """ -from __future__ import print_function -from __future__ import absolute_import - # System modules import errno import io diff --git a/lldb/packages/Python/lldbsuite/test/test_categories.py b/lldb/packages/Python/lldbsuite/test/test_categories.py --- a/lldb/packages/Python/lldbsuite/test/test_categories.py +++ b/lldb/packages/Python/lldbsuite/test/test_categories.py @@ -2,9 +2,6 @@ Provides definitions for various lldb test categories """ -from __future__ import absolute_import -from __future__ import print_function - # System modules import sys diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py @@ -2,9 +2,6 @@ Base class for gdb-remote test cases. """ -from __future__ import division, print_function - - import errno import os import os.path diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py @@ -1,8 +1,6 @@ """Module for supporting unit testing of the lldb-server debug monitor exe. """ -from __future__ import division, print_function - import binascii import os import os.path diff --git a/lldb/scripts/android/host_art_bt.py b/lldb/scripts/android/host_art_bt.py --- a/lldb/scripts/android/host_art_bt.py +++ b/lldb/scripts/android/host_art_bt.py @@ -5,8 +5,6 @@ # 'command script import host_art_bt.py' # 'host_art_bt' -from __future__ import print_function - import sys import re diff --git a/lldb/third_party/Python/module/progress/progress.py b/lldb/third_party/Python/module/progress/progress.py --- a/lldb/third_party/Python/module/progress/progress.py +++ b/lldb/third_party/Python/module/progress/progress.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -from __future__ import print_function - import use_lldb_suite import sys diff --git a/lldb/third_party/Python/module/unittest2/unittest2/test/test_result.py b/lldb/third_party/Python/module/unittest2/unittest2/test/test_result.py --- a/lldb/third_party/Python/module/unittest2/unittest2/test/test_result.py +++ b/lldb/third_party/Python/module/unittest2/unittest2/test/test_result.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import sys import textwrap from StringIO import StringIO diff --git a/lldb/third_party/Python/module/unittest2/unittest2/test/test_unittest2_with.py b/lldb/third_party/Python/module/unittest2/unittest2/test/test_unittest2_with.py --- a/lldb/third_party/Python/module/unittest2/unittest2/test/test_unittest2_with.py +++ b/lldb/third_party/Python/module/unittest2/unittest2/test/test_unittest2_with.py @@ -1,5 +1,3 @@ -from __future__ import with_statement - import unittest2 from unittest2.test.support import OldTestResult, catch_warnings diff --git a/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py b/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py --- a/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py +++ b/lldb/tools/intel-features/intel-mpx/test/TestMPXTable.py @@ -2,9 +2,6 @@ Test mpx-table command. """ -from __future__ import print_function - - import os import time import re diff --git a/lldb/utils/lui/lldbutil.py b/lldb/utils/lui/lldbutil.py --- a/lldb/utils/lui/lldbutil.py +++ b/lldb/utils/lui/lldbutil.py @@ -12,8 +12,6 @@ They can also be useful for general purpose lldb scripting. """ -from __future__ import print_function - import lldb import os import sys