[Lldb-commits] [lldb] r252030 - Revert "Python 3 - Don't add the _d suffix to the symlink on Windows."

[Zachary Turner via lldb-commits]

Author: zturner
Date: Tue Nov  3 19:26:48 2015
New Revision: 252030

URL: http://llvm.org/viewvc/llvm-project?rev=252030&view=rev
Log:
Revert "Python 3 - Don't add the _d suffix to the symlink on Windows."

This reverts commit e59c95ca936f5a0a8abb987b8605fd8bf82b03b6.

This was a mistake on my part.  The real problem was with my
environment.  I was using a release interpreter to try to load
my debug extension module.  I noticed this after I finally managed
to get into my extension module's init method, and then it segfaulted
with heap errors due to mismatched CRT (debug vs. release)

Removed:
    lldb/trunk/scripts/use_lldb_suite.py
Modified:
    lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
    lldb/trunk/scripts/buildSwigWrapperClasses.py
    lldb/trunk/scripts/finishSwigWrapperClasses.py

Modified: lldb/trunk/scripts/Python/finishSwigPythonLLDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/finishSwigPythonLLDB.py?rev=252030&r1=252029&r2=252030&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/finishSwigPythonLLDB.py (original)
+++ lldb/trunk/scripts/Python/finishSwigPythonLLDB.py Tue Nov  3 19:26:48 2015
@@ -350,10 +350,8 @@ def make_symlink_liblldb( vDictArgs, vst
     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:

Modified: lldb/trunk/scripts/buildSwigWrapperClasses.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/buildSwigWrapperClasses.py?rev=252030&r1=252029&r2=252030&view=diff
==============================================================================
--- lldb/trunk/scripts/buildSwigWrapperClasses.py (original)
+++ lldb/trunk/scripts/buildSwigWrapperClasses.py Tue Nov  3 19:26:48 2015
@@ -31,8 +31,6 @@ import os       # Provide directory and
 # 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

Modified: lldb/trunk/scripts/finishSwigWrapperClasses.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/finishSwigWrapperClasses.py?rev=252030&r1=252029&r2=252030&view=diff
==============================================================================
--- lldb/trunk/scripts/finishSwigWrapperClasses.py (original)
+++ lldb/trunk/scripts/finishSwigWrapperClasses.py Tue Nov  3 19:26:48 2015
@@ -29,8 +29,6 @@ import os       # Provide directory and
 # 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

Removed: lldb/trunk/scripts/use_lldb_suite.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/use_lldb_suite.py?rev=252029&view=auto
==============================================================================
--- lldb/trunk/scripts/use_lldb_suite.py (original)
+++ lldb/trunk/scripts/use_lldb_suite.py (removed)
@@ -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)