[Lldb-commits] [lldb] 193259c - [LLDB] Remove __future__ imports from tests
David Spickett via lldb-commits
lldb-commits at lists.llvm.org
Mon Aug 15 01:54:12 PDT 2022
Author: David Spickett
Date: 2022-08-15T08:54:06Z
New Revision: 193259cbcec77add8e189c4dedeefb15fef50d5e
URL: https://github.com/llvm/llvm-project/commit/193259cbcec77add8e189c4dedeefb15fef50d5e
DIFF: https://github.com/llvm/llvm-project/commit/193259cbcec77add8e189c4dedeefb15fef50d5e.diff
LOG: [LLDB] Remove __future__ imports from tests
Not needed now that we require python 3.
Reviewed By: kastiglione, JDevlieghere
Differential Revision: https://reviews.llvm.org/D131761
Added:
Modified:
lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
lldb/test/API/api/multiple-targets/TestMultipleTargets.py
lldb/test/API/api/multithreaded/TestMultithreaded.py
lldb/test/API/arm/emulation/TestEmulations.py
lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
lldb/test/API/benchmarks/expression/TestExpressionCmd.py
lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
lldb/test/API/benchmarks/startup/TestStartupDelays.py
lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
lldb/test/API/commands/command/container/welcome.py
lldb/test/API/commands/command/script/decorated.py
lldb/test/API/commands/command/script/import/bar/bar.py
lldb/test/API/commands/command/script/import/foo/bar/foobar.py
lldb/test/API/commands/command/script/import/foo/foo.py
lldb/test/API/commands/command/script/import/foo/foo2.py
lldb/test/API/commands/command/script/import/thepackage/__init__.py
lldb/test/API/commands/command/script/mysto.py
lldb/test/API/commands/command/script/welcome.py
lldb/test/API/commands/command/script_alias/tcsacmd.py
lldb/test/API/commands/command/source/my.py
lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
lldb/test/API/commands/process/launch/TestProcessLaunch.py
lldb/test/API/commands/register/register/register_command/TestRegisters.py
lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py
lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py
lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
lldb/test/API/functionalities/exec/TestExec.py
lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
lldb/test/API/functionalities/gdb_remote_client/TestFork.py
lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
lldb/test/API/functionalities/load_unload/TestLoadUnload.py
lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
lldb/test/API/functionalities/tty/TestTerminal.py
lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
lldb/test/API/lang/objc/foundation/TestObjCMethods.py
lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
lldb/test/API/lang/objc/print-obj/TestPrintObj.py
lldb/test/API/lldbtest.py
lldb/test/API/macosx/queues/TestQueues.py
lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
lldb/test/API/python_api/event/TestEvents.py
lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
lldb/test/API/python_api/frame/TestFrames.py
lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
lldb/test/API/python_api/module_section/TestModuleAndSection.py
lldb/test/API/python_api/process/TestProcessAPI.py
lldb/test/API/python_api/process/io/TestProcessIO.py
lldb/test/API/python_api/symbol-context/TestSymbolContext.py
lldb/test/API/python_api/target/TestTargetAPI.py
lldb/test/API/python_api/thread/TestThreadAPI.py
lldb/test/API/python_api/type/TestTypeList.py
lldb/test/API/python_api/value/TestValueAPI.py
lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
lldb/test/API/qemu/TestQemuAPI.py
lldb/test/API/qemu/TestQemuLaunch.py
lldb/test/API/sample_test/TestSampleInlineTest.py
lldb/test/API/source-manager/TestSourceManager.py
lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
lldb/test/API/test_runner/test/inferior.py
lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
lldb/test/API/types/AbstractBase.py
lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
lldb/test/Shell/helper/build.py
Removed:
################################################################################
diff --git a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
index 2c871ac44e254..1980b1434595f 100644
--- a/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/test/API/api/check_public_api_headers/TestPublicAPIHeaders.py
@@ -3,9 +3,6 @@
There should be nothing unwanted there and a simpe main.cpp which includes SB*.h
should compile and link with the LLDB framework."""
-from __future__ import print_function
-
-
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
diff --git a/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py b/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
index 7ae74625d0200..7c853c9d051e3 100644
--- a/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
+++ b/lldb/test/API/api/command-return-object/TestSBCommandReturnObject.py
@@ -1,8 +1,5 @@
"""Test the lldb public C++ api for returning SBCommandReturnObject."""
-from __future__ import print_function
-
-
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
diff --git a/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
index 40065ce69f85d..da7445f27eac7 100644
--- a/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/test/API/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -1,8 +1,5 @@
"""Test the lldb public C++ api when doing multiple debug sessions simultaneously."""
-from __future__ import print_function
-
-
import os
import lldb
diff --git a/lldb/test/API/api/multiple-targets/TestMultipleTargets.py b/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
index 1d5b1cd270df4..02435a5507dfb 100644
--- a/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
+++ b/lldb/test/API/api/multiple-targets/TestMultipleTargets.py
@@ -1,8 +1,5 @@
"""Test the lldb public C++ api when creating multiple targets simultaneously."""
-from __future__ import print_function
-
-
import os
import lldb
diff --git a/lldb/test/API/api/multithreaded/TestMultithreaded.py b/lldb/test/API/api/multithreaded/TestMultithreaded.py
index f8681dd75fc13..231eb9ffefc42 100644
--- a/lldb/test/API/api/multithreaded/TestMultithreaded.py
+++ b/lldb/test/API/api/multithreaded/TestMultithreaded.py
@@ -1,7 +1,5 @@
"""Test the lldb public C++ api breakpoint callbacks."""
-from __future__ import print_function
-
# __package__ = "lldbsuite.test"
diff --git a/lldb/test/API/arm/emulation/TestEmulations.py b/lldb/test/API/arm/emulation/TestEmulations.py
index 84119efb3aeb6..77c457351afb8 100644
--- a/lldb/test/API/arm/emulation/TestEmulations.py
+++ b/lldb/test/API/arm/emulation/TestEmulations.py
@@ -2,9 +2,6 @@
Test some ARM instruction emulation.
"""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py b/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
index 9338e4677e8fc..5e1c400290a20 100644
--- a/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/test/API/benchmarks/continue/TestBenchmarkContinue.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbbench import *
diff --git a/lldb/test/API/benchmarks/expression/TestExpressionCmd.py b/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
index 19dfcb6b465ef..30d4ac6c227f7 100644
--- a/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/test/API/benchmarks/expression/TestExpressionCmd.py
@@ -1,8 +1,5 @@
"""Test lldb's expression evaluations and collect statistics."""
-from __future__ import print_function
-
-
import sys
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py b/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
index 9ce1ab410caff..194e4cdc90a5c 100644
--- a/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/test/API/benchmarks/expression/TestRepeatedExprs.py
@@ -1,8 +1,5 @@
"""Test evaluating expressions repeatedly comparing lldb against gdb."""
-from __future__ import print_function
-
-
import sys
import lldb
from lldbsuite.test.lldbbench import BenchBase
diff --git a/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
index 87d3eb139dc41..598952c6ea836 100644
--- a/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/test/API/benchmarks/frame_variable/TestFrameVariableResponse.py
@@ -1,8 +1,5 @@
"""Test lldb's response time for 'frame variable' command."""
-from __future__ import print_function
-
-
import sys
import lldb
from lldbsuite.test import configuration
diff --git a/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py b/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
index 11585eb34eb85..b791fbefd21f5 100644
--- a/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
+++ b/lldb/test/API/benchmarks/libcxxlist/TestBenchmarkLibcxxList.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbbench import *
diff --git a/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py b/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
index 4fcbcb1ebe715..905e60f9464f1 100644
--- a/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
+++ b/lldb/test/API/benchmarks/libcxxmap/TestBenchmarkLibcxxMap.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.lldbbench import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/benchmarks/startup/TestStartupDelays.py b/lldb/test/API/benchmarks/startup/TestStartupDelays.py
index b6533b8533c92..6c29bf6bac314 100644
--- a/lldb/test/API/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/test/API/benchmarks/startup/TestStartupDelays.py
@@ -1,8 +1,5 @@
"""Test lldb's startup delays creating a target, setting a breakpoint, and run to breakpoint stop."""
-from __future__ import print_function
-
-
import sys
import lldb
from lldbsuite.test import configuration
diff --git a/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py b/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
index dbaf8985713fa..73113a12db387 100644
--- a/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/test/API/benchmarks/stepping/TestSteppingSpeed.py
@@ -1,7 +1,5 @@
"""Test lldb's stepping speed."""
-from __future__ import print_function
-
import sys
import lldb
from lldbsuite.test import configuration
diff --git a/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index dbd05dbca0ecd..69ec55a35e174 100644
--- a/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/test/API/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
@@ -1,8 +1,5 @@
"""Benchmark the turnaround time starting a debugger and run to the breakpoint with lldb vs. gdb."""
-from __future__ import print_function
-
-
import sys
import lldb
from lldbsuite.test.lldbbench import *
diff --git a/lldb/test/API/commands/command/container/welcome.py b/lldb/test/API/commands/command/container/welcome.py
index 9d435e1794488..eca5ecd8d8d1c 100644
--- a/lldb/test/API/commands/command/container/welcome.py
+++ b/lldb/test/API/commands/command/container/welcome.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import sys
diff --git a/lldb/test/API/commands/command/script/decorated.py b/lldb/test/API/commands/command/script/decorated.py
index f9707a5706ac1..0b4b9d8a67e58 100644
--- a/lldb/test/API/commands/command/script/decorated.py
+++ b/lldb/test/API/commands/command/script/decorated.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import lldb
diff --git a/lldb/test/API/commands/command/script/import/bar/bar.py b/lldb/test/API/commands/command/script/import/bar/bar.py
index 444e00976ad99..5a2c6b1f40661 100644
--- a/lldb/test/API/commands/command/script/import/bar/bar.py
+++ b/lldb/test/API/commands/command/script/import/bar/bar.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
def bar_function(debugger, args, result, dict):
global UtilityModule
print(UtilityModule.barutil_function("bar told me " + args), file=result)
diff --git a/lldb/test/API/commands/command/script/import/foo/bar/foobar.py b/lldb/test/API/commands/command/script/import/foo/bar/foobar.py
index 6ef71064c9a9d..421603a43fac4 100644
--- a/lldb/test/API/commands/command/script/import/foo/bar/foobar.py
+++ b/lldb/test/API/commands/command/script/import/foo/bar/foobar.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
def foo_function(debugger, args, result, dict):
print("foobar says " + args, file=result)
return None
diff --git a/lldb/test/API/commands/command/script/import/foo/foo.py b/lldb/test/API/commands/command/script/import/foo/foo.py
index 1ccc389293968..6ad69b1563f66 100644
--- a/lldb/test/API/commands/command/script/import/foo/foo.py
+++ b/lldb/test/API/commands/command/script/import/foo/foo.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
def foo_function(debugger, args, result, dict):
print("foo says " + args, file=result)
return None
diff --git a/lldb/test/API/commands/command/script/import/foo/foo2.py b/lldb/test/API/commands/command/script/import/foo/foo2.py
index 71657c299c219..58e8cbab098b1 100644
--- a/lldb/test/API/commands/command/script/import/foo/foo2.py
+++ b/lldb/test/API/commands/command/script/import/foo/foo2.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
def foo2_function(debugger, args, result, dict):
print("foo2 says " + args, file=result)
return None
diff --git a/lldb/test/API/commands/command/script/import/thepackage/__init__.py b/lldb/test/API/commands/command/script/import/thepackage/__init__.py
index 24cdea60f2c42..a326355c32a66 100644
--- a/lldb/test/API/commands/command/script/import/thepackage/__init__.py
+++ b/lldb/test/API/commands/command/script/import/thepackage/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from . import TPunitA
from . import TPunitB
diff --git a/lldb/test/API/commands/command/script/mysto.py b/lldb/test/API/commands/command/script/mysto.py
index 04eceb7eb9398..335007b81a22e 100644
--- a/lldb/test/API/commands/command/script/mysto.py
+++ b/lldb/test/API/commands/command/script/mysto.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import lldb
diff --git a/lldb/test/API/commands/command/script/welcome.py b/lldb/test/API/commands/command/script/welcome.py
index 0539d7c17211e..9ecd93a8062b3 100644
--- a/lldb/test/API/commands/command/script/welcome.py
+++ b/lldb/test/API/commands/command/script/welcome.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import sys
diff --git a/lldb/test/API/commands/command/script_alias/tcsacmd.py b/lldb/test/API/commands/command/script_alias/tcsacmd.py
index 8d3248c27234b..00d4dbc5585c9 100644
--- a/lldb/test/API/commands/command/script_alias/tcsacmd.py
+++ b/lldb/test/API/commands/command/script_alias/tcsacmd.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
diff --git a/lldb/test/API/commands/command/source/my.py b/lldb/test/API/commands/command/source/my.py
index bd97fda3cbbf1..425bdee7d6214 100644
--- a/lldb/test/API/commands/command/source/my.py
+++ b/lldb/test/API/commands/command/source/my.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
def date():
import datetime
today = datetime.date.today()
diff --git a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
index 96536d7a61351..35b31649cab42 100644
--- a/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
+++ b/lldb/test/API/commands/expression/no-deadlock/TestExprDoesntBlock.py
@@ -2,9 +2,6 @@
Test that expr will time out and allow other threads to run if it blocks.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/commands/process/launch/TestProcessLaunch.py b/lldb/test/API/commands/process/launch/TestProcessLaunch.py
index e9e7348413289..de74fd2cb50ca 100644
--- a/lldb/test/API/commands/process/launch/TestProcessLaunch.py
+++ b/lldb/test/API/commands/process/launch/TestProcessLaunch.py
@@ -2,8 +2,6 @@
Test lldb process launch flags.
"""
-from __future__ import print_function
-
import os
import lldb
diff --git a/lldb/test/API/commands/register/register/register_command/TestRegisters.py b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
index 5893acd926537..5661a7588ab2f 100644
--- a/lldb/test/API/commands/register/register/register_command/TestRegisters.py
+++ b/lldb/test/API/commands/register/register/register_command/TestRegisters.py
@@ -2,9 +2,6 @@
Test the 'register' command.
"""
-from __future__ import print_function
-
-
import os
import sys
import lldb
diff --git a/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
index e66a1f3e99e00..2826941b0b5cc 100644
--- a/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/test/API/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
@@ -2,9 +2,6 @@
Test that lldb watchpoint works for multiple threads.
"""
-from __future__ import print_function
-
-
import re
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py b/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
index 1d6266a6b81d4..16299992f6805 100644
--- a/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/test/API/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
@@ -1,8 +1,5 @@
"""Test that adding, deleting and modifying watchpoints sends the appropriate events."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
index fa9197b0fa973..969ea43ceba1c 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
@@ -2,9 +2,6 @@
Test that you can set breakpoint commands successfully with the Python API's:
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py b/lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py
index d635ae45c7c80..f91905afd8b93 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_command/bktptcmd.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import side_effect
def useless_function(first, second):
diff --git a/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
index 7638746decd1f..757e675748374 100644
--- a/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
+++ b/lldb/test/API/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
@@ -2,8 +2,6 @@
Test specific to MIPS
"""
-from __future__ import print_function
-
import re
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index d4da4dd9aeac8..8296ae62877c6 100644
--- a/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/test/API/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
@@ -2,9 +2,6 @@
Test lldb breakpoint ids.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py b/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
index 49499fdc58b72..2c9fd2533c3e7 100644
--- a/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
+++ b/lldb/test/API/functionalities/breakpoint/move_nearest/TestMoveNearest.py
@@ -1,6 +1,3 @@
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
diff --git a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
index 9033d60a22f53..84272a9410952 100644
--- a/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/test/API/functionalities/conditional_break/TestConditionalBreak.py
@@ -2,9 +2,6 @@
Test conditionally break on a function and inspect its variables.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py
index 47e272d4fe2e1..beabb23d4ffef 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjCNSNumber.py
@@ -3,8 +3,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index e2cde963def7f..40a26623bccf7 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
index 89a2b5f5ba300..62ca287cb27db 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index e47952971726e..2e1367563cd7b 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py b/lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
index 734e711fb7fcf..ca5af6f2122b9 100644
--- a/lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
+++ b/lldb/test/API/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from lldbsuite.test import lldbinline
lldbinline.MakeInlineTest(
diff --git a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index 2eb34a8bc27d5..893e9b7d0b64f 100644
--- a/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/test/API/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
@@ -2,9 +2,6 @@
Check that vector types format properly
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/exec/TestExec.py b/lldb/test/API/functionalities/exec/TestExec.py
index 3da9c2f6fbc3a..864abb6533aef 100644
--- a/lldb/test/API/functionalities/exec/TestExec.py
+++ b/lldb/test/API/functionalities/exec/TestExec.py
@@ -1,8 +1,6 @@
"""
Test some lldb command abbreviations.
"""
-from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py b/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
index aeaac0bcc9153..885f8a7b5b426 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestAArch64XMLRegOffsets.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
from textwrap import dedent
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
index 6d816bf6c8fd8..1ffab033e9132 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestArmRegisterDefinition.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestFork.py b/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
index bf66f25a55186..fda01325c27d3 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestFork.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import unittest
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
index 09a72f33d3f1b..8010c4ecadecd 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerNoTargetXML.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
index f39bdee1010e7..f9bb0cc1f05e2 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestGDBServerTargetXML.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py b/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
index 4c071bada5b74..10880f930c634 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestJLink6Armv7RegisterDefinition.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py b/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
index be9d46f639bcc..3973449cc4c60 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestMultiprocess.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import unittest
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py b/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
index 4880b53a634a1..2b77716cf2b4d 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNestedRegDefinitions.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
index 87a4240422e59..da4d23cee147e 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoGPacketSupported.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
index 6333fa3eb10cb..bad56d460ea8e 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestNoWatchpointSupportInfo.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py b/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
index 744fff3c34004..4c05cf2ca2371 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestPartialGPacket.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py b/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
index 3b80d98f0a7e3..0e89308e1dd42 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRegDefinitionInParts.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import time
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py b/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
index 1e7da3edc9ef2..a7d0b9fa8343e 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRemoteRegNums.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py b/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
index 99fdda1788455..586ab0b19fbdb 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestRestartBug.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py b/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
index c3e6b5cb01e92..d4dec3214c3ba 100644
--- a/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
+++ b/lldb/test/API/functionalities/gdb_remote_client/TestTargetXMLArch.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
index 235ed94816bb5..bd4c1d3acf200 100644
--- a/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/test/API/functionalities/inferior-assert/TestInferiorAssert.py
@@ -1,8 +1,5 @@
"""Test that lldb functions correctly after the inferior has asserted."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test import lldbutil
from lldbsuite.test import lldbplatformutil
diff --git a/lldb/test/API/functionalities/load_unload/TestLoadUnload.py b/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
index d310c08d77426..92b42a456789b 100644
--- a/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/test/API/functionalities/load_unload/TestLoadUnload.py
@@ -2,9 +2,6 @@
Test that breakpoint by symbol name works correctly with dynamic libs.
"""
-from __future__ import print_function
-
-
import os
import re
import lldb
diff --git a/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py b/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
index 6df914a243a15..9a120b3f6843f 100644
--- a/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
+++ b/lldb/test/API/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
@@ -2,9 +2,6 @@
Test that commands do not try and hold on to stale CommandInterpreters in a multiple debuggers scenario
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py b/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
index d64492772e3a7..3ac2cdd6419ae 100644
--- a/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
+++ b/lldb/test/API/functionalities/plugins/command_plugin/TestPluginCommands.py
@@ -2,9 +2,6 @@
Test that plugins that load commands work correctly.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
index a04bf3b627b07..45914e408f8d8 100644
--- a/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
+++ b/lldb/test/API/functionalities/plugins/python_os_plugin/stepping_plugin_threads/TestOSPluginStepping.py
@@ -3,9 +3,6 @@
all threads at every stop.
"""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py b/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
index 3f0094057cd54..0669fbd63e37f 100644
--- a/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
+++ b/lldb/test/API/functionalities/postmortem/elf-core/TestLinuxCore.py
@@ -2,8 +2,6 @@
Test basics of linux core file debugging.
"""
-from __future__ import division, print_function
-
import shutil
import struct
import os
diff --git a/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py b/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
index c22ef5818164a..bd7f9d51287f0 100644
--- a/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
+++ b/lldb/test/API/functionalities/postmortem/netbsd-core/TestNetBSDCore.py
@@ -2,8 +2,6 @@
Test NetBSD core file debugging.
"""
-from __future__ import division, print_function
-
import signal
import os
diff --git a/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py b/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
index 09651250a3f65..4d83bf322ccc7 100644
--- a/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/test/API/functionalities/recursion/TestValueObjectRecursion.py
@@ -2,9 +2,6 @@
Test lldb data formatter subsystem.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py b/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
index 7f26e5e53a40d..73dfa37dc575e 100644
--- a/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
+++ b/lldb/test/API/functionalities/target-new-solib-notifications/TestModuleLoadedNotifys.py
@@ -3,9 +3,6 @@
they should be delivered in batches instead of one-by-one.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/tty/TestTerminal.py b/lldb/test/API/functionalities/tty/TestTerminal.py
index e4af08fa00ead..18704fd0aaabd 100644
--- a/lldb/test/API/functionalities/tty/TestTerminal.py
+++ b/lldb/test/API/functionalities/tty/TestTerminal.py
@@ -2,9 +2,6 @@
Test lldb command aliases.
"""
-from __future__ import print_function
-
-
import unittest2
import os
import lldb
diff --git a/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
index 1bcd75a96b408..7821c84f17e3b 100644
--- a/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/test/API/functionalities/unwind/noreturn/TestNoreturnUnwind.py
@@ -2,9 +2,6 @@
Test that we can backtrace correctly with 'noreturn' functions on the stack
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
index e7d22964fc69a..66729c4339064 100644
--- a/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/test/API/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
@@ -2,9 +2,6 @@
Test that we can backtrace correctly with 'sigtramp' functions on the stack
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
index 23c336a73b023..a7294bf2adec0 100644
--- a/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
+++ b/lldb/test/API/functionalities/unwind/zeroth_frame/TestZerothFrame.py
@@ -21,9 +21,6 @@
when using API directly, for example in LLDB-MI.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
index a3321fcb2cd95..41eb54e2f6582 100644
--- a/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
+++ b/lldb/test/API/lang/c/step_over_no_deadlock/TestStepOverDoesntBlock.py
@@ -2,9 +2,6 @@
Test that step over will let other threads run when necessary
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
index 7adc82f1a6396..d24f38de65398 100644
--- a/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/API/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -2,9 +2,6 @@
Test the lldb disassemble command on each call frame when stopped on C's ctor.
"""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
index cd5ffea6380f4..5b298b442196a 100644
--- a/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/test/API/lang/cpp/dynamic-value/TestCppValueCast.py
@@ -2,9 +2,6 @@
Test lldb Python API SBValue::Cast(SBType) for C++ types.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
index cc24308f42b09..eb698980b2cf2 100644
--- a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -2,9 +2,6 @@
Test the lldb disassemble command on lib stdc++.
"""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py b/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
index 8f6ae646844bd..88aea291d6648 100644
--- a/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
+++ b/lldb/test/API/lang/objc/direct-dispatch-step/TestObjCDirectDispatchStepping.py
@@ -1,8 +1,5 @@
"""Test stepping through ObjC method dispatch in various forms."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
index ac4477977b656..3a61c7db87335 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjCMethods.py
@@ -3,9 +3,6 @@
Also lookup objective-c data types and evaluate expressions.
"""
-from __future__ import print_function
-
-
import os
import os.path
import lldb
diff --git a/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
index fd9713c313725..0fef809e00726 100644
--- a/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/test/API/lang/objc/foundation/TestObjectDescriptionAPI.py
@@ -2,9 +2,6 @@
Test SBValue.GetObjectDescription() with the value from SBTarget.FindGlobalVariables().
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
index c1fd60371cf38..7ab5fe2945ed8 100644
--- a/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/test/API/lang/objc/objc-class-method/TestObjCClassMethod.py
@@ -1,8 +1,5 @@
"""Test calling functions in class methods."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
index 7943f5421182c..5b4fffd6ccf0a 100644
--- a/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/test/API/lang/objc/objc-stepping/TestObjCStepping.py
@@ -1,8 +1,5 @@
"""Test stepping through ObjC method dispatch in various forms."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lang/objc/print-obj/TestPrintObj.py b/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
index 18d60d24e222d..4e81fd08fb715 100644
--- a/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/test/API/lang/objc/print-obj/TestPrintObj.py
@@ -2,9 +2,6 @@
Test "print object" where another thread blocks the print object from making progress.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/lldbtest.py b/lldb/test/API/lldbtest.py
index e48e4c97a60b6..ad91b6a73b8d7 100644
--- a/lldb/test/API/lldbtest.py
+++ b/lldb/test/API/lldbtest.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
import os
import re
import operator
diff --git a/lldb/test/API/macosx/queues/TestQueues.py b/lldb/test/API/macosx/queues/TestQueues.py
index 77c04d4d6f064..7bd5787413ab3 100644
--- a/lldb/test/API/macosx/queues/TestQueues.py
+++ b/lldb/test/API/macosx/queues/TestQueues.py
@@ -1,8 +1,5 @@
"""Test queues inspection SB APIs."""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 20f2884a2e933..b739dc8578057 100644
--- a/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/test/API/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
@@ -11,9 +11,6 @@
after default construction.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
index 4186e6b330f08..ab1062aaaeb43 100644
--- a/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/test/API/python_api/disassemble-raw-data/TestDisassembleRawData.py
@@ -2,9 +2,6 @@
Use lldb Python API to disassemble raw machine code bytes
"""
-from __future__ import print_function
-
-
import re
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index 28ba4d627d697..140e3deda1574 100644
--- a/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/test/API/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
@@ -2,8 +2,6 @@
Use lldb Python API to disassemble raw machine code bytes
"""
-from __future__ import print_function
-
from io import StringIO
import sys
diff --git a/lldb/test/API/python_api/event/TestEvents.py b/lldb/test/API/python_api/event/TestEvents.py
index 946494f2dc242..734986dc5078e 100644
--- a/lldb/test/API/python_api/event/TestEvents.py
+++ b/lldb/test/API/python_api/event/TestEvents.py
@@ -2,9 +2,6 @@
Test lldb Python event APIs.
"""
-from __future__ import print_function
-
-
import re
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py b/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
index 45d78cdb474c1..508ace7cfe7c3 100644
--- a/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/test/API/python_api/formatters/TestFormattersSBAPI.py
@@ -1,8 +1,5 @@
"""Test Python APIs for working with formatters"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/frame/TestFrames.py b/lldb/test/API/python_api/frame/TestFrames.py
index 06bb1d346e86b..5d7e32aac2983 100644
--- a/lldb/test/API/python_api/frame/TestFrames.py
+++ b/lldb/test/API/python_api/frame/TestFrames.py
@@ -3,8 +3,6 @@
And other SBFrame API tests.
"""
-from __future__ import print_function
-
import io
import lldb
diff --git a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
index 903e341b571e5..c02115fb89309 100644
--- a/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
+++ b/lldb/test/API/python_api/frame/get-variables/TestGetVariables.py
@@ -2,9 +2,6 @@
Test that SBFrame::GetVariables() calls work correctly.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
index 34981b7b9bd4c..ed4bc87bd3357 100644
--- a/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/test/API/python_api/frame/inlines/TestInlinedFrame.py
@@ -2,9 +2,6 @@
Testlldb Python SBFrame APIs IsInlined() and GetFunctionName().
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
index 6bc65cfba4878..dbdbe751ec745 100644
--- a/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestDisasmAPI.py
@@ -2,9 +2,6 @@
Test retrieval of SBAddress from function/symbol, disassembly, and SBAddress APIs.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
index a1435b0b676b7..5e6a02a33e3ef 100644
--- a/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/test/API/python_api/function_symbol/TestSymbolAPI.py
@@ -2,9 +2,6 @@
Test newly added SBSymbol and SBAddress APIs.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
index bf1fe3ffb62b2..ba8713be23cec 100644
--- a/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/test/API/python_api/interpreter/TestCommandInterpreterAPI.py
@@ -1,8 +1,5 @@
"""Test the SBCommandInterpreter APIs."""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
index 840037948ead1..bba5469c28aa4 100644
--- a/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/test/API/python_api/lldbutil/frame/TestFrameUtils.py
@@ -2,9 +2,6 @@
Test utility functions for the frame object.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
index 9ae51602bf243..ca85769217445 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -2,9 +2,6 @@
Test the iteration protocol for some lldb container objects.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
index d8058f21b914b..b32cb59c4938f 100644
--- a/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/test/API/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -2,9 +2,6 @@
Test the iteration protocol for frame registers.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/module_section/TestModuleAndSection.py b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
index 403f20ab9f182..493d372408c58 100644
--- a/lldb/test/API/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/test/API/python_api/module_section/TestModuleAndSection.py
@@ -2,9 +2,6 @@
Test some SBModule and SBSection APIs.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/process/TestProcessAPI.py b/lldb/test/API/python_api/process/TestProcessAPI.py
index 9be2ff52e190a..3fad30a78a172 100644
--- a/lldb/test/API/python_api/process/TestProcessAPI.py
+++ b/lldb/test/API/python_api/process/TestProcessAPI.py
@@ -2,9 +2,6 @@
Test SBProcess APIs, including ReadMemory(), WriteMemory(), and others.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/process/io/TestProcessIO.py b/lldb/test/API/python_api/process/io/TestProcessIO.py
index 0051a4b88cfa3..d763a87da0481 100644
--- a/lldb/test/API/python_api/process/io/TestProcessIO.py
+++ b/lldb/test/API/python_api/process/io/TestProcessIO.py
@@ -1,8 +1,5 @@
"""Test Python APIs for process IO."""
-from __future__ import print_function
-
-
import os
import lldb
from lldbsuite.test.decorators import *
diff --git a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
index e6ec78e9af941..8094845936f89 100644
--- a/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/test/API/python_api/symbol-context/TestSymbolContext.py
@@ -2,8 +2,6 @@
Test SBSymbolContext APIs.
"""
-from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/target/TestTargetAPI.py b/lldb/test/API/python_api/target/TestTargetAPI.py
index bebbb08a4e474..0b2514416bede 100644
--- a/lldb/test/API/python_api/target/TestTargetAPI.py
+++ b/lldb/test/API/python_api/target/TestTargetAPI.py
@@ -2,9 +2,6 @@
Test SBTarget APIs.
"""
-from __future__ import print_function
-
-
import unittest2
import os
import lldb
diff --git a/lldb/test/API/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py
index 50dd73c4f8ad7..7bdcf36810b5a 100644
--- a/lldb/test/API/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/API/python_api/thread/TestThreadAPI.py
@@ -2,9 +2,6 @@
Test SBThread APIs.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/type/TestTypeList.py b/lldb/test/API/python_api/type/TestTypeList.py
index 9d465bde5fab0..1bc830fa78b85 100644
--- a/lldb/test/API/python_api/type/TestTypeList.py
+++ b/lldb/test/API/python_api/type/TestTypeList.py
@@ -2,10 +2,6 @@
Test SBType and SBTypeList API.
"""
-from __future__ import print_function
-
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/value/TestValueAPI.py b/lldb/test/API/python_api/value/TestValueAPI.py
index b75b4ef8899be..98546e8f08f9e 100644
--- a/lldb/test/API/python_api/value/TestValueAPI.py
+++ b/lldb/test/API/python_api/value/TestValueAPI.py
@@ -2,9 +2,6 @@
Test some SBValue APIs.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
index 8001cfb69d07a..3ff4cedc6d34a 100644
--- a/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/test/API/python_api/value/linked_list/TestValueAPILinkedList.py
@@ -3,9 +3,6 @@
supports iteration till the end of list is reached.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py b/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
index 829054e55ffc5..1a6f18e9dfa32 100644
--- a/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/test/API/python_api/watchpoint/TestSetWatchpoint.py
@@ -2,9 +2,6 @@
Use lldb Python SBValue API to create a watchpoint for read_write of 'globl' var.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
index 4e8288acfcc93..91cbda1b304fe 100644
--- a/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/test/API/python_api/watchpoint/TestWatchpointIgnoreCount.py
@@ -2,9 +2,6 @@
Use lldb Python SBWatchpoint API to set the ignore count.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py b/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
index 7b83cfac05ed6..3aa65ad0b5722 100644
--- a/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/test/API/python_api/watchpoint/TestWatchpointIter.py
@@ -2,10 +2,6 @@
Use lldb Python SBTarget API to iterate on the watchpoint(s) for the target.
"""
-from __future__ import print_function
-
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 585a936b73a1e..fdba9d6aa9ab4 100644
--- a/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/test/API/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
@@ -2,9 +2,6 @@
Test watchpoint condition API.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 7cbc6a54f5d23..bd4d3095341a5 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
@@ -2,10 +2,6 @@
Use lldb Python SBValue.WatchPointee() API to create a watchpoint for write of '*g_char_ptr'.
"""
-from __future__ import print_function
-
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index e41d65a3adef8..8177e391468fe 100644
--- a/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/test/API/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
@@ -2,9 +2,6 @@
Use lldb Python SBtarget.WatchAddress() API to create a watchpoint for write of '*g_char_ptr'.
"""
-from __future__ import print_function
-
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/qemu/TestQemuAPI.py b/lldb/test/API/qemu/TestQemuAPI.py
index 2ef5bb3854d59..05db64fc21837 100644
--- a/lldb/test/API/qemu/TestQemuAPI.py
+++ b/lldb/test/API/qemu/TestQemuAPI.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import os
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/qemu/TestQemuLaunch.py b/lldb/test/API/qemu/TestQemuLaunch.py
index d9342701ba3b4..07d83c63aebcb 100644
--- a/lldb/test/API/qemu/TestQemuLaunch.py
+++ b/lldb/test/API/qemu/TestQemuLaunch.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import lldb
import unittest
import os
diff --git a/lldb/test/API/sample_test/TestSampleInlineTest.py b/lldb/test/API/sample_test/TestSampleInlineTest.py
index 29fad79de8113..6a5c6980d7cc7 100644
--- a/lldb/test/API/sample_test/TestSampleInlineTest.py
+++ b/lldb/test/API/sample_test/TestSampleInlineTest.py
@@ -2,8 +2,6 @@
Describe the purpose of the test here.
"""
-from __future__ import absolute_import
-
from lldbsuite.test import lldbinline
lldbinline.MakeInlineTest(
diff --git a/lldb/test/API/source-manager/TestSourceManager.py b/lldb/test/API/source-manager/TestSourceManager.py
index a44f0bbbc174e..439366c989875 100644
--- a/lldb/test/API/source-manager/TestSourceManager.py
+++ b/lldb/test/API/source-manager/TestSourceManager.py
@@ -9,8 +9,6 @@
Test the caching mechanism of the source manager.
"""
-from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py b/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
index 7e5dd7afcaf0e..e9111d80de3ce 100644
--- a/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/test/API/terminal/TestSTTYBeforeAndAfter.py
@@ -2,9 +2,6 @@
Test that 'stty -a' displays the same output before and after running the lldb command.
"""
-from __future__ import print_function
-
-
import lldb
import io
import sys
diff --git a/lldb/test/API/test_runner/test/inferior.py b/lldb/test/API/test_runner/test/inferior.py
index 4207bac300fdb..606a83a3b37dd 100755
--- a/lldb/test/API/test_runner/test/inferior.py
+++ b/lldb/test/API/test_runner/test/inferior.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python
"""Inferior program used by process control tests."""
-from __future__ import print_function
-
import argparse
import datetime
import signal
diff --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
index 59db1907e8160..d6123e688365b 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# lldb test suite imports
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import TestBase
diff --git a/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py b/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
index fec1e95fa28c3..8149eb6e08122 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemotePlatformFile.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
# lldb test suite imports
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import TestBase
diff --git a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
index 2bbfb2783f3e6..7c90a4f4e00b8 100644
--- a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
+++ b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import gdbremote_testcase
import random
import select
diff --git a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
index 5ebb4f7067b14..2b3609709d727 100644
--- a/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
+++ b/lldb/test/API/tools/lldb-vscode/console/TestVSCode_console.py
@@ -2,8 +2,6 @@
Test lldb-vscode setBreakpoints request
"""
-from __future__ import print_function
-
import vscode
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py b/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
index a175d0e3a8852..98fbb7356ec15 100644
--- a/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
+++ b/lldb/test/API/tools/lldb-vscode/correct-thread/TestVSCode_correct_thread.py
@@ -2,8 +2,6 @@
Test lldb-vscode setBreakpoints request
"""
-from __future__ import print_function
-
import vscode
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py b/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
index 641eb290dd14b..b56bf9886abb4 100644
--- a/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
+++ b/lldb/test/API/tools/lldb-vscode/module/TestVSCode_module.py
@@ -2,8 +2,6 @@
Test lldb-vscode setBreakpoints request
"""
-from __future__ import print_function
-
import vscode
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py b/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
index 4101822915333..3f7ac7cdc77ab 100644
--- a/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
+++ b/lldb/test/API/tools/lldb-vscode/optimized/TestVSCode_optimized.py
@@ -2,8 +2,6 @@
Test lldb-vscode variables/stackTrace request for optimized code
"""
-from __future__ import print_function
-
import vscode
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
index abf34eaad3d0d..b4ed393290c3d 100644
--- a/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
+++ b/lldb/test/API/tools/lldb-vscode/variables/TestVSCode_variables.py
@@ -2,8 +2,6 @@
Test lldb-vscode setBreakpoints request
"""
-from __future__ import print_function
-
import vscode
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
diff --git a/lldb/test/API/types/AbstractBase.py b/lldb/test/API/types/AbstractBase.py
index fe304e19ca66b..d1ad5cf0e29bc 100644
--- a/lldb/test/API/types/AbstractBase.py
+++ b/lldb/test/API/types/AbstractBase.py
@@ -2,8 +2,6 @@
Abstract base class of basic types provides a generic type tester method.
"""
-from __future__ import print_function
-
import os
import re
import lldb
diff --git a/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
index 14add9943dc75..311ff7ab76aac 100644
--- a/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
+++ b/lldb/test/Shell/Commands/CommandScriptImmediateOutput/Inputs/custom_command.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
import sys
diff --git a/lldb/test/Shell/helper/build.py b/lldb/test/Shell/helper/build.py
index 97d790661d5a1..4b1fe239239a2 100755
--- a/lldb/test/Shell/helper/build.py
+++ b/lldb/test/Shell/helper/build.py
@@ -1,7 +1,5 @@
#!/usr/bin/env python
-from __future__ import print_function
-
import argparse
import os
import shutil
More information about the lldb-commits
mailing list