[lldb][NFC] Remove 'from __future__ import print_function' from all tests that don't actually call 'print()'

Summary:
A lot of tests do this trick but the vast majority of them don't even call `print()`.

Most of this patch was generated by a script that just looks at all the files and deletes the line if there is no `print (` or `print(` anywhere else in the file.
I checked the remaining tests manually and deleted the import if we never call print (but instead do stuff like `expr print(...)` and similar false-positives).
I also corrected the additional empty lines after the import in the files that I manually edited.

Reviewers: JDevlieghere, labath, jfb

Reviewed By: labath

Subscribers: dexonsmith, wuzish, nemanjai, kbarton, christof, arphaman, abidh, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D71452

93 files changed, 0 insertions, 95 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py
index 11c3bc86a6e..8a0fe377f26 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py
@@ -1,6 +1,5 @@
 """Test that the 'add-dsym', aka 'target symbols add', command informs the user about success or failure."""
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
index 1e146d9f62e..122a608e7ff 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
@@ -2,7 +2,6 @@
 Test that apropos env doesn't crash trying to touch the process plugin command
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py b/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py
index 2763ab50c88..c866198f26b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py
@@ -2,7 +2,6 @@
 Test the command history mechanism
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
index 1a7b01ab260..983714e2cf6 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
@@ -2,7 +2,6 @@
 Test that an alias can reference other aliases without crashing.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py
index 9542d0264a6..de449612a37 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py
@@ -2,7 +2,6 @@
 Test lldb Python commands.
 """
 
-from __future__ import print_function
 
 import sys
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py
index 21e599b82e5..c31e84cbb53 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/callables.py
@@ -1,5 +1,4 @@
 
-from __future__ import print_function
 
 import lldb
 
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py
index bbeee1a5e32..9a96f78b922 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py
@@ -1,6 +1,5 @@
 """Test custom import command to import files by path."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py
index fdcf8764e67..ab48c21dd66 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py
@@ -1,6 +1,5 @@
 """Check that we handle an ImportError in a special way when command script importing files."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
index 515cbf10a6c..c4c8fdb1fd8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
@@ -2,7 +2,6 @@
 Test lldb Python commands.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py b/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py
index a30f0d497be..6d2717b16e2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py
@@ -2,7 +2,6 @@
 Test that lldb command "command source" works correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py
index 1ad8e23ac9b..4130aae9621 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py
@@ -2,7 +2,6 @@
 Test some lldb command abbreviations.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py
index 912b37d6d3e..8e0cc963883 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py
@@ -2,7 +2,6 @@
 Test to ensure SBFrame::Disassemble produces SOME output
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
index 1108b121532..d53fc522078 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
@@ -6,7 +6,6 @@ untagged structures.
 Ticket: https://llvm.org/bugs/show_bug.cgi?id=26790
 """
 
-from __future__ import print_function
 
 import lldb
 
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py b/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
index 46ea111bf03..29d370e2335 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
@@ -2,7 +2,6 @@
 Test calling an expression without a target.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py
index 0065d98f473..afa84a948e5 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py
@@ -2,7 +2,6 @@
 Tests calling builtin functions using expression evaluation.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py
index af78e523e3c..261e702fa59 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py
@@ -2,7 +2,6 @@
 Test calling std::String member functions.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py
index d832983bdb6..0f0f1a54e31 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py
@@ -2,7 +2,6 @@
 Test calling a function, stopping in the call, continue and gather the result on stop.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py
index 0eb7086b616..8ced082680d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py
@@ -7,7 +7,6 @@ Note:
 
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py
index cef06f3717b..a61e69a1476 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py
@@ -2,7 +2,6 @@
 Test calling a function that hits a signal set to auto-restart, make sure the call completes.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py
index c6b90ba5ba0..fea56f1bb5b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py
@@ -2,7 +2,6 @@
 Test calling a function that throws an ObjC exception, make sure that it doesn't propagate the exception.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py b/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py
index 5eeb657ff54..f1fa7805384 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py
index 33a423c806b..5266266b6ab 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py
@@ -2,7 +2,6 @@
 Test the lldb command line completion mechanism for the 'expr' command.
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py
index 19d9fa7e425..2babcc48cff 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py
@@ -2,7 +2,6 @@
 Test that --allow-jit=false does disallow JITting:
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
index 6a7e6075253..a383f691120 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
@@ -1,8 +1,5 @@
 """Test that we are able to evaluate expressions when the inferior is blocked in a syscall"""
 
-from __future__ import print_function
-
-
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py
index 9aa28f77a3f..c93a05abe89 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py
@@ -2,7 +2,6 @@
 Test calling an expression with errors that a FixIt can fix.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
index 4d86ac5daa6..98872dffca3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
@@ -2,7 +2,6 @@
 Test using LLDB data formatters with frozen objects coming from the expression parser.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py
index 509e3fbd6d0..dd1308ba58f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py
@@ -2,7 +2,6 @@
 Test the IR interpreter
 """
 
-from __future__ import print_function
 
 import unittest2
 
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py
index 2c20b63cfd9..abff18f3fa1 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py
@@ -4,7 +4,6 @@ valobj.AddressOf() returns None when an address is
 expected in a SyntheticChildrenProvider
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py
index 26e4309605e..aed83e224e5 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py b/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py
index 8af0ea1ba0c..833833a866f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py
@@ -7,7 +7,6 @@ o test_expr_options:
   Test expression command options.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index e165e5f0ce1..577753c0497 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -2,7 +2,6 @@
 Test that we can p *objcObject
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
index 7b963b5bfcd..54cb4832312 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
@@ -2,7 +2,6 @@
 Test that we can have persistent pointer variables
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py
index bde649b0e07..973eade3e56 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py
@@ -2,7 +2,6 @@
 Test that nested persistent types work.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py
index 91681b480eb..e60a76861b6 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py
@@ -2,7 +2,6 @@
 Test that lldb persistent types works correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
index 57370f121b4..57c04b215e9 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
@@ -2,7 +2,6 @@
 Test that lldb persistent variables works correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py
index 4530342ea52..e203b386d5b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py
@@ -2,7 +2,6 @@
 Test that the po command acts correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py
index 6d019c7415f..23dbce9227e 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py
index e7a5f597b70..b0da7e798ed 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py
@@ -2,7 +2,6 @@
 Test the robustness of lldb expression parser.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py
index 4ff28bdfe86..56e7186ace3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py
@@ -2,7 +2,6 @@
 The evaluating printf(...) after break stop and then up a stack frame.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py
index 5406fb0e987..3eb3a86adf2 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py
@@ -2,7 +2,6 @@
 Test example snippets from the lldb 'help expression' output.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py
index 896e599f59c..62925c6f94f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py
@@ -2,7 +2,6 @@
 Test that LLDB can emit JIT objects when the appropriate setting is enabled
 """
 
-from __future__ import print_function
 
 import os
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py
index e7bc79d8e7c..dd40e87d68d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py
index 4fe228d40d4..8437eac250b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py
@@ -11,7 +11,6 @@ o test_expr_commands_can_handle_quotes:
   Throw some expression commands with quotes at lldb.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py
index 1a733bebffe..cd02f89b461 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py
@@ -2,7 +2,6 @@
 Test some more expression commands.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py
index 7862477001e..a64167ef55c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py
@@ -2,7 +2,6 @@
 Test calling a function that waits a while, and make sure the timeout option to expr works.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py
index e6a632b7f23..4e1a3779cfc 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py
@@ -2,7 +2,6 @@
 Test top-level expressions.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index bac8e5453e4..c518bf0559f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
@@ -4,7 +4,6 @@ Regression test for <rdar://problem/8981098>:
 The expression parser's type search only looks in the current compilation unit for types.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py
index d42ee3de404..de883f47f93 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py
@@ -2,7 +2,6 @@
 Test stopping at a breakpoint in an expression, and unwinding from there.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py
index 2b097e81ddf..21280ea3ae5 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py
@@ -3,7 +3,6 @@ Test that we can compile expressions referring to
 absent weak symbols from a dylib.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py
index 3aac6488660..3a394d781f0 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py
index 741fb7bbaa0..dca564c38a8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for an array access
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py
index 3ba0f7a6c42..8650484f12a 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for dereferencing a bad reference
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
index 52691d9f471..ccc0f88efe0 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for a subexpression of a complicated expression
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
index c0dac49586f..bdc89a6ed83 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for dereferencing a function argument
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
index ebce5ae54c2..c49c80791af 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for dereferencing a function's return value
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
index 1251ad551ac..85de511e56d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for dereferencing `this`
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
index 18fb263b47b..54d44f0cb3c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for calling virtual methods
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py
index e4fd86e0db4..8d49d30b5e7 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for dereferencing a local variable
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
index ed91b487c95..7ea42dea49c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
@@ -2,7 +2,6 @@
 Test the output of `frame diagnose` for calling virtual methods
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
index ed3e9efb0a5..90b29baef45 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
@@ -2,7 +2,6 @@
 Test the SB API SBFrame::GuessLanguage.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py b/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py
index 8b294a71c18..a9a9aa1da33 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py
@@ -2,7 +2,6 @@
 Make sure the frame variable -g, -a, and -l flags work.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py
index 5d52a00e2de..31656af633c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py
@@ -4,7 +4,6 @@ Test some lldb help commands.
 See also CommandInterpreter::OutputFormattedHelpText().
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py b/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py
index 5199057cadc..16321dca86f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py
@@ -2,7 +2,6 @@
 Test lldb logging.  This test just makes sure logging doesn't crash, and produces some output.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py
index 2e1deefe90e..ab45b221c94 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py
@@ -2,7 +2,6 @@
 Test some lldb platform commands.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py
index f105847d0bb..ab10d30b6ff 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py
@@ -2,7 +2,6 @@
 Test the lldb platform Python API.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py b/lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
index a22b3e5a03f..102d6f92dd1 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/platform/process/TestProcessList.py
@@ -2,7 +2,6 @@
 Test process list.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
index 2c402e6a31a..8e5a3a94357 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
@@ -2,7 +2,6 @@
 Test process attach/resume.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py
index 6210ba0eefc..b85d5713350 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py
@@ -2,7 +2,6 @@
 Test process attach.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py
index 49499554c2e..dcd73da42e9 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py
@@ -2,7 +2,6 @@
 Test denied process attach.
 """
 
-from __future__ import print_function
 
 
 import time
diff --git a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
index 64a2894069b..b71d1a0123d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
@@ -1,7 +1,6 @@
 """
 Test that argdumper is a viable launching strategy.
 """
-from __future__ import print_function
 import os
 
 
diff --git a/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py b/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py
index 28c05b833d6..d4dbd16869a 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py
@@ -2,7 +2,6 @@
 Test lldb's quit command.
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py
index f61ba59a5fe..64099650b41 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py
@@ -2,7 +2,6 @@
 Test the Intel(R) MPX registers.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
index 5b5f6aa19cb..9a812a146b6 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
@@ -2,7 +2,6 @@
 Test the Intel(R) MPX bound violation signal.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py
index cca16357668..7b53d92836a 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_offset_intersection/TestMPXOffsetIntersection.py
@@ -2,7 +2,6 @@
 Test Intel(R) MPX registers do not get overwritten by AVX data.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py
index de56195ab2f..3b9f64707bb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py
@@ -2,7 +2,6 @@
 Test lldb settings command.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
index 441b1cc3c87..5853313db6f 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
@@ -2,7 +2,6 @@
 Test quoting of arguments to lldb commands
 """
 
-from __future__ import print_function
 
 
 
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py b/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py
index c16c6b46dc8..6152a6a9673 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py
@@ -2,7 +2,6 @@
 Test some target commands: create, list, select, variable.
 """
 
-from __future__ import print_function
 import os
 import stat
 import tempfile
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py
index 2d96433b7d4..31be1cc86fa 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py
@@ -3,7 +3,6 @@ Test that loading of dependents works correctly for all the potential
 combinations.
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
index fd9812320f2..a780ca27566 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
@@ -1,7 +1,6 @@
 """
 Test that using a non-existent architecture name does not crash LLDB.
 """
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py
index b8f04915563..497f99f7dd9 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py
@@ -2,7 +2,6 @@
 Test that stop hooks trigger on "step-out"
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
index 33127bf51e2..1b8e5d89b5b 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
@@ -2,7 +2,6 @@
 Test lldb watchpoint that uses '-s size' to watch a pointed location with size.
 """
 
-from __future__ import print_function
 
 
 import re
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
index 4e604a6f014..30edbe73951 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
@@ -2,7 +2,6 @@
 Test my first lldb watchpoint.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
index 589e2a3393b..843a2ac7477 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
@@ -4,7 +4,6 @@ within same word boundary. We should be able to install individual watchpoints
 on any of the bytes, half-word, or word. This is only for ARM/AArch64 targets.
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py
index 77c58c0b891..2186dd0a42c 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py
@@ -2,7 +2,6 @@
 Test handling of cases when a single instruction triggers multiple watchpoints
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
index 605e4e86c85..44cf5213881 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
@@ -1,6 +1,5 @@
 """Test stepping over watchpoints."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 79cb5ae4761..40119d229f8 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@@ -2,7 +2,6 @@
 Test that a variable watchpoint should only hit when in scope.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
index b92c03eae23..27c332b68bb 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
@@ -2,7 +2,6 @@
 Test watchpoint list, enable, disable, and delete commands.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index 08d220dabc3..6718d8c2035 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -2,7 +2,6 @@
 Test 'watchpoint command'.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
index b9a67c6cdc4..137ac832151 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
@@ -2,7 +2,6 @@
 Test 'watchpoint command'.
 """
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index e456b2b57c3..83984180062 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
@@ -2,7 +2,6 @@
 Test watchpoint modify command to set condition on a watchpoint.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
index c1b3fb9485b..af574efc39d 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
@@ -2,7 +2,6 @@
 Test displayed value of a vector variable while doing watchpoint operations
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index 7953dabebfd..b9b11e4b0c5 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
@@ -2,7 +2,6 @@
 Test lldb watchpoint that uses 'watchpoint set -w write -s size' to watch a pointed location with size.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
index c14fd7d7efa..e6634f1e4a3 100644
--- a/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
@@ -5,7 +5,6 @@ when they are packed in a 8-byte region.
 
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *