[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

96 files changed, 0 insertions, 102 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
index 00c416554d2..69e23e3510b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
@@ -1,6 +1,5 @@
 """Test that anonymous structs/unions are transparent to member access"""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
index db05c04b6ab..cc9ae8edb6e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
@@ -1,6 +1,5 @@
 """Test breakpoint by file/line number; and list variables with array types."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
index 8192a605169..7b28a321ff6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
@@ -1,6 +1,5 @@
 """Show bitfields and check that they display correctly."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
index 47e6cd1c67e..cd82d159248 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
@@ -1,6 +1,5 @@
 """Test that lldb can invoke blocks and access variables inside them"""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
index 2d36cdeb42e..9d088e308ed 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py
@@ -1,6 +1,5 @@
 """Test that conflicting symbols in different shared libraries work correctly"""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
index 5aacd67a067..59fa6bcb0a1 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
@@ -1,6 +1,5 @@
 """Check that compiler-generated constant values work correctly"""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
index 7ab1199fa95..af9b6fb8d46 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
@@ -1,6 +1,5 @@
 """Look up enum type information and check for correct display."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py
index 6a171c93698..6e69c3e1d25 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/find_struct_type/TestFindStructTypes.py
@@ -2,7 +2,6 @@
 Make sure FindTypes finds struct types with the struct prefix.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
index 6d8b87ca8bd..9ea13612c07 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
@@ -1,6 +1,5 @@
 """Test that forward declaration of a data structure gets resolved correctly."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
index 7c903b238c0..3753eab64ef 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
@@ -1,6 +1,5 @@
 """Test variable with function ptr type and that break on the function works."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
index 4956744a84b..690d1abb3cf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
@@ -1,6 +1,5 @@
 """Show global variables and check that they do indeed have global scopes."""
 
-from __future__ import print_function
 
 
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py b/lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py
index 3c53de1fe39..e40c3163c05 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/local_types/TestUseClosestType.py
@@ -5,7 +5,6 @@ even if there are other definitions of the type in other
 CU's.  Assert that that is true.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py
index b1805f4a8b4..381292a445b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/local_variables/TestLocalVariables.py
@@ -5,7 +5,6 @@ DW_OP_constu(X < 32) to DW_OP_litX which broke the debugger because
 it didn't read the value as an unsigned.
 """
 
-from __future__ import print_function
 
 
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
index ce4664c53d3..948e8bed786 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
@@ -1,6 +1,5 @@
 """Test that importing modules in C works as expected."""
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
index b17fb866287..f16d554b815 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
@@ -1,6 +1,5 @@
 """Test settings and readings of program variables."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
index 250088e38ee..789939b29e7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
@@ -1,6 +1,5 @@
 """Test that types defined in shared libraries work correctly."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index 3731d1a1eb6..8858f67cd18 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
@@ -1,6 +1,5 @@
 """Test that types defined in shared libraries with stripped symbols work correctly."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py
index b3786fb9445..7665b2f73b6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/step-target/TestStepTarget.py
@@ -1,6 +1,5 @@
 """Test the 'step target' feature."""
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
index c9460b787d4..c20e443b683 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
@@ -1,6 +1,5 @@
 """Test stepping over vrs. hitting breakpoints & subsequent stepping in various forms."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
index c7e23069dac..43ed10d8b1a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
@@ -2,7 +2,6 @@
 Test thread stepping features in combination with frame select.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
index 52e63ecac99..b1fd2b8d031 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
@@ -1,6 +1,5 @@
 """Test that thread-local storage can be read correctly."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
index 6321426974c..cbbb6362381 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
@@ -1,6 +1,5 @@
 """Look up type information for typedefs of same name at different lexical scope and check for correct display."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 6a6ae14fefb..32c974810f7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
@@ -2,7 +2,6 @@
 Test lldb breakpoint command for CPP methods & functions in a namespace.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
index e2f13c608b4..986d9e59cdf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
@@ -3,7 +3,6 @@
 Test that the C++11 support for char16_t and char32_t works correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py
index ddbe3733a7e..e7f2c1afbdd 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/TestCxxChar8_t.py
@@ -3,7 +3,6 @@
 Test that C++ supports char8_t correctly.
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
index 8f941af68d0..7c019e0e7cf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
@@ -2,7 +2,6 @@
 Test display and Python APIs on file and class static variables.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
index 6971e5693a2..45d64431ab3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
@@ -1,6 +1,5 @@
 """Test breakpoint on a class constructor; and variable list the this object."""
 
-from __future__ import print_function
 
 
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
index fa9bcf14e15..115951a4fd7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/TestDynamicValueSameBase.py
@@ -3,7 +3,6 @@ Make sure if we have two classes with the same base name the
 dynamic value calculator doesn't confuse them
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
index 2b887ebc2a6..c3d7dfb328f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
@@ -2,7 +2,6 @@
 Use lldb Python API to test dynamic values in C++
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index a250dfdd398..c58f700039e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
@@ -1,6 +1,5 @@
 """Look up enum type information and check for correct display."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index 93ada9bd15c..e888958987a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
@@ -2,7 +2,6 @@
 Test lldb exception breakpoint command for CPP.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py
index 5e240b8ac63..4870247995f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py
@@ -1,6 +1,5 @@
 """Test that C++ global variables can be inspected by name and also their mangled name."""
 
-from __future__ import print_function
 
 
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py
index f94c6c34ddd..5f77d8f5963 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/inlines/TestInlines.py
@@ -1,6 +1,5 @@
 """Test variable lookup when stopped in inline functions."""
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py
index cee551d2bc8..e7f98c63b5e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/modules-import/TestCXXModulesImport.py
@@ -1,6 +1,5 @@
 """Test that importing modules in C++ works as expected."""
 
-from __future__ import print_function
 
 import unittest2
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
index 3d2a5421929..3ccaa79f8ca 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
@@ -2,7 +2,6 @@
 Test the printing of anonymous and named namespace variables.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
index 1860daabffc..5526a14f530 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
@@ -2,7 +2,6 @@
 Test the printing of anonymous and named namespace variables.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
index ecca75b4b11..e96a9fb93b7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/TestNamespaceDefinitions.py
@@ -1,6 +1,5 @@
 """Test that forward declarations don't cause bogus conflicts in namespaced types"""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
index 3bb415ebb59..f61cd64130d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -2,7 +2,6 @@
 Test that variables with signed types display correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
index b8c777f417a..4e02ebe8965 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
@@ -2,7 +2,6 @@
 Tests that C++ member and static variables have correct layout and scope.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
index 348d03ead53..d667321493e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/TestStdFunctionStepIntoCallable.py
@@ -2,7 +2,6 @@
 Test stepping into std::function
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
index 9f2965a2de1..341b205389f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
@@ -2,7 +2,6 @@
 Test some expressions involving STL data types.
 """
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py
index 27cf324baec..e90e5f8e711 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/TestTrivialABI.py
@@ -2,7 +2,6 @@
 Test that we work properly with classes with the trivial_abi attribute
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
index 7fa3f95ae9a..45be73118f8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
@@ -2,7 +2,6 @@
 Test that we can lookup types correctly in the expression parser
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py
index b59e323894a..c1bd892447a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/TestUnicodeLiterals.py
@@ -3,7 +3,6 @@
 Test that the expression parser returns proper Unicode strings.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
index 3e4fee0b49b..78121c14970 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
@@ -2,7 +2,6 @@
 Test that template instaniations of std::vector<long> and <short> in the same module have the correct types.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index 12055a970c0..ca754f470da 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -2,7 +2,6 @@
 Test that variables with unsigned types display correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
index 3f3f92416cb..22fe96b96d2 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
@@ -2,8 +2,6 @@
 Test C++ virtual function and virtual inheritance.
 """
 
-from __future__ import print_function
-
 import os
 import re
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
index 21093298da0..b59d71e8e8e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
@@ -3,7 +3,6 @@
 Test that C++ supports wchar_t correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
index d015413f588..b4fe5396291 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
@@ -1,6 +1,5 @@
 """Test that lldb works correctly on compile units form different languages."""
 
-from __future__ import print_function
 
 
 import re
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
index 3e549f7b46c..e790e6e9d96 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
@@ -1,8 +1,5 @@
 """Test printing ivars and ObjC objects captured in blocks that are made in methods of an ObjC class."""
 
-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/lang/objc/conflicting-definition/TestConflictingDefinition.py b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestConflictingDefinition.py
index 8813d66d072..f49858ca4f3 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestConflictingDefinition.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestConflictingDefinition.py
@@ -1,6 +1,5 @@
 """Test that types defined in shared libraries work correctly."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
index 1d4ee9aa579..dbf6287bb20 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/exceptions/TestObjCExceptions.py
@@ -3,7 +3,6 @@
 Test lldb Obj-C exception support.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
index 1f1e36acbe4..fd35d64c191 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
@@ -1,6 +1,5 @@
 """Test that a forward-declared class works when its complete definition is in a library"""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
index fb946acd7b4..6e8e9898e19 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
@@ -3,7 +3,6 @@ Test that objective-c constant strings are generated correctly by the expression
 parser.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
index 28d3558126d..b2d0d190eb0 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
@@ -2,7 +2,6 @@
 Test more expression command sequences with objective-c.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py
index b199b8a9451..8080029ef02 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSArray.py
@@ -2,7 +2,6 @@
 Test more expression command sequences with objective-c.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py
index 20a2119e841..07717926b5e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsNSError.py
@@ -2,7 +2,6 @@
 Test more expression command sequences with objective-c.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py
index e2c17006350..65ccb0c19b5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethodsString.py
@@ -2,7 +2,6 @@
 Test more expression command sequences with objective-c.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
index d23428e7fca..f5cb75b4a6d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
@@ -2,7 +2,6 @@
 Test that Objective-C methods from the runtime work correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
index a199dfae950..abfc7621e2e 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
@@ -2,10 +2,6 @@
 Test symbol table access for main.m.
 """
 
-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/lang/objc/global_ptrs/TestGlobalObjects.py b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/TestGlobalObjects.py
index 7cc83300dbf..5cc6f4e7ba9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/TestGlobalObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/global_ptrs/TestGlobalObjects.py
@@ -1,6 +1,5 @@
 """Test that a global ObjC object found before the process is started updates correctly."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index ce62c6ae0c2..03a325ac49c 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -1,6 +1,5 @@
 """Test that hidden ivars in a shared library are visible from the main executable."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index 1fe4e84f5e8..3019bcfc5cf 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
@@ -2,7 +2,6 @@
 Test that dynamically discovered ivars of type IMP do not crash LLDB
 """
 
-from __future__ import print_function
 
 
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
index 9aefe1ce24d..044e8396e67 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import unittest2
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
index e2f546c88fd..449e5b50d05 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
@@ -1,6 +1,5 @@
 """Test that importing modules in Objective-C works as expected."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
index 4d177b60ce5..88c319cbc3f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
@@ -1,6 +1,5 @@
 """Test that the clang modules cache directory can be controlled."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
index 298e26ee400..d01145f906d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import unittest2
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index 63d0a36227b..8fed6133f7d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -1,6 +1,5 @@
 """Test that DWARF types are trusted over module types"""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 6e9e4f7bd8d..fffb04f91cd 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -1,6 +1,5 @@
 """Test that inline functions from modules are imported correctly"""
 
-from __future__ import print_function
 
 
 
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py
index 28e4fe46cb5..fb29030adc5 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-update/TestClangModulesUpdate.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import unittest2
 import os
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
index 336b6140440..695eac9ee85 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
@@ -1,6 +1,5 @@
 """Test that importing modules in Objective-C works as expected."""
 
-from __future__ import print_function
 
 
 import unittest2
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
index f9df8302425..344af99f589 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
@@ -2,7 +2,6 @@
 Make sure that ivars of Objective-C++ classes are visible in LLDB.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index 6135bd9f6e8..8f974f03838 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
@@ -2,7 +2,6 @@
 Use lldb Python API to test base class resolution for ObjC classes
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
index 9f82ee08ba1..d07b827e771 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
@@ -1,6 +1,5 @@
 """Test that the expression parser doesn't get confused by 'id' and 'Class'"""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
index 8a7d4f6fbb7..ac2dc2a3899 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
@@ -2,7 +2,6 @@
 Use lldb Python API to make sure the dynamic checkers are doing their jobs.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index b148cf9e281..1851bc33264 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
@@ -2,7 +2,6 @@
 Test that we are able to properly report a usable dynamic type
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index e62ab67a8fb..5a6ec4ed39d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -2,7 +2,6 @@
 Use lldb Python API to test dynamic values in ObjC
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 53d84e9f287..749c7137dc9 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -1,6 +1,5 @@
 """Test printing ObjC objects that use unbacked properties - so that the static ivar offsets are incorrect."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index 78b6f0e083d..12a22f6b903 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
@@ -1,6 +1,5 @@
 """Test printing ObjC objects that use unbacked properties - so that the static ivar offsets are incorrect."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py
index 95deaf6eb09..cf638c7a108 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxArray.py
@@ -1,6 +1,5 @@
 """Test that the Objective-C syntax for dictionary/array literals and indexing works"""
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py
index 0cb26bb033f..5291b46da2f 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxDictionary.py
@@ -1,6 +1,5 @@
 """Test that the Objective-C syntax for dictionary/array literals and indexing works"""
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py
index 6516530b807..e17343bed72 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntaxLiteral.py
@@ -1,6 +1,5 @@
 """Test that the Objective-C syntax for dictionary/array literals and indexing works"""
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
index 3a8630b7a00..6209f14e7e4 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -6,7 +6,6 @@ or 'self' variable was not properly read if the compiler
 optimized it into a register.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
index eb71dd06218..3092c3f086a 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
@@ -2,7 +2,6 @@
 Use lldb Python API to verify that expression evaluation for property references uses the correct getters and setters
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index 9dae4468c67..8ee73eda3f7 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
@@ -1,6 +1,5 @@
 """Test calling functions in static methods with a stripped binary."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index 324bd098794..ce18a07394b 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
@@ -1,6 +1,5 @@
 """Test calling functions in static methods."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index faf0661cca9..28188afc142 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -1,6 +1,5 @@
 """Test passing structs to Objective-C methods."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
index 3a29f1058c8..c8c54848a99 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
@@ -1,6 +1,5 @@
 """Test calling functions in class methods."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
index 399440f6a38..5cb46e007d8 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
@@ -1,6 +1,5 @@
 """Test calling methods on super."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py
index d46a48ed9b9..aade40c06b6 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ptr_refs/TestPtrRefsObjC.py
@@ -2,7 +2,6 @@
 Test the ptr_refs tool on Darwin with Objective-C
 """
 
-from __future__ import print_function
 
 import lldb
 from lldbsuite.test.decorators import *
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index b8eb21c48a1..632ef7bfe73 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
@@ -2,7 +2,6 @@
 Test that objective-c method returning BOOL works correctly.
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
index cf4cf056787..c6633b7fe52 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
@@ -2,7 +2,6 @@
 Test that CoreFoundation classes CFGregorianDate and CFRange are not improperly uniqued
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
index d4ab1b1fff6..f9e825ada43 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
@@ -2,7 +2,6 @@
 Test that we do not attempt to make a dynamic type for a 'const char*'
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
index af9714f042b..8f262a3413d 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
@@ -2,7 +2,6 @@
 Test that we are able to find out how many children NSWindow has
 """
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
index 2595119a1eb..002bc6cbf82 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
@@ -1,6 +1,5 @@
 """Test that types defined in shared libraries work correctly."""
 
-from __future__ import print_function
 
 
 import lldb
diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
index 7e712961cd7..85ad6286716 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/TestObjCSingleEntryDictionary.py
@@ -1,6 +1,5 @@
 """Test that we properly vend children for a single entry NSDictionary"""
 
-from __future__ import print_function
 
 
 import unittest2