4 files changed, 2 insertions, 30 deletions
diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py
index d6eb10d6c99..45cb8b98887 100644
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -350,10 +350,8 @@ def make_symlink_liblldb( vDictArgs, vstrFrameworkPythonDir, vstrLiblldbFileName
     if eOSType == utilsOsType.EnumOsType.Windows:
         # When importing an extension module using a debug version of python, you
         # write, for example, "import foo", but the interpreter searches for
-        # "foo_d.pyd".  This only applies for Python 2, however.  Python 3 does
-        # not use the _d suffix for extension modules.
-        import six
-        if is_debug_interpreter() and six.PY2:
+        # "foo_d.pyd"
+        if is_debug_interpreter():
             strTarget += "_d";
         strTarget += ".pyd";
     else:
diff --git a/lldb/scripts/buildSwigWrapperClasses.py b/lldb/scripts/buildSwigWrapperClasses.py
index a9fa7ca6cd2..ff5cfb737de 100644
--- a/lldb/scripts/buildSwigWrapperClasses.py
+++ b/lldb/scripts/buildSwigWrapperClasses.py
@@ -31,8 +31,6 @@ import os       # Provide directory and file handling
 # Third party modules:
 
 # In-house modules:
-import use_lldb_suite   # Modify sys.path so we can use shared / third-party libraries
-
 import utilsArgsParse   # Parse and validate this script's input arguments
 import utilsOsType      # Determine the OS type this script is running on
 import utilsDebug       # Debug Python scripts
diff --git a/lldb/scripts/finishSwigWrapperClasses.py b/lldb/scripts/finishSwigWrapperClasses.py
index b58211862f0..3e576263562 100644
--- a/lldb/scripts/finishSwigWrapperClasses.py
+++ b/lldb/scripts/finishSwigWrapperClasses.py
@@ -29,8 +29,6 @@ import os       # Provide directory and file handling
 # Third party modules:
 
 # In-house modules:
-import use_lldb_suite   # Modify sys.path so we can use shared / third-party libraries
-
 import utilsArgsParse   # Parse and validate this script's input arguments
 import utilsOsType      # Determine the OS type this script is running on
 import utilsDebug       # Debug Python scripts
diff --git a/lldb/scripts/use_lldb_suite.py b/lldb/scripts/use_lldb_suite.py
deleted file mode 100644
index 3dbcbb91700..00000000000
--- a/lldb/scripts/use_lldb_suite.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import inspect
-import os
-import sys
-
-def find_lldb_root():
-    lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
-    while True:
-        lldb_root = os.path.dirname(lldb_root)
-        if lldb_root is None:
-            return None
-
-        test_path = os.path.join(lldb_root, "lldb.root")
-        if os.path.isfile(test_path):
-            return lldb_root
-    return None
-
-lldb_root = find_lldb_root()
-if lldb_root is not None:
-    import imp
-    module = imp.find_module("use_lldb_suite_root", [lldb_root])
-    if module is not None:
-        imp.load_module("use_lldb_suite_root", *module)