caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Python] Fix issue configuring sys.path during startup.

Browse Source 
Previously, users on Windows had to manually specify PYTHONPATH
to point to the site-packages directory before running LLDB.
The reason for this was because sys.path was being initialized
with a path containing unescaped backslashes, causing escape
sequences to end up in the paths.

llvm-svn: 234516
This commit is contained in:
Zachary Turner
2015-04-09 18:08:50 +00:00
parent 37099d9afd
commit 4e8ddf5333
5 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lldb/source/Interpreter/ScriptInterpreterPython.cpp
View File

@@ -3044,36 +3044,17 @@ ScriptInterpreterPython::InitializePrivate ()
// Update the path python uses to search for modules to include the current directory.
PyRun_SimpleString ("import sys");
PyRun_SimpleString ("sys.path.append ('.')");
// Find the module that owns this code and use that path we get to
// set the sys.path appropriately.
AddToSysPath(AddLocation::End, ".");
FileSpec file_spec;
char python_dir_path[PATH_MAX];
// Don't denormalize paths when calling file_spec.GetPath(). On platforms that use
// a backslash as the path separator, this will result in executing python code containing
// paths with unescaped backslashes. But Python also accepts forward slashes, so to make
// life easier we just use that.
if (HostInfo::GetLLDBPath(ePathTypePythonDir, file_spec))
{
std::string python_path("sys.path.insert(0,\"");
size_t orig_len = python_path.length();
if (file_spec.GetPath(python_dir_path, sizeof (python_dir_path)))
{
python_path.append (python_dir_path);
python_path.append ("\")");
PyRun_SimpleString (python_path.c_str());
python_path.resize (orig_len);
}
if (HostInfo::GetLLDBPath(ePathTypeLLDBShlibDir, file_spec))
{
if (file_spec.GetPath(python_dir_path, sizeof (python_dir_path)))
{
python_path.append (python_dir_path);
python_path.append ("\")");
PyRun_SimpleString (python_path.c_str());
python_path.resize (orig_len);
}
}
}
AddToSysPath(AddLocation::Beginning, file_spec.GetPath(false));
if (HostInfo::GetLLDBPath(ePathTypeLLDBShlibDir, file_spec))
AddToSysPath(AddLocation::Beginning, file_spec.GetPath(false));
PyRun_SimpleString ("sys.dont_write_bytecode = 1; import lldb.embedded_interpreter; from lldb.embedded_interpreter import run_python_interpreter; from lldb.embedded_interpreter import run_one_line");
@@ -3089,6 +3070,28 @@ ScriptInterpreterPython::InitializePrivate ()
stdin_tty_state.Restore();
}
void
ScriptInterpreterPython::AddToSysPath(AddLocation location, std::string path)
{
std::string path_copy;
std::string statement;
if (location == AddLocation::Beginning)
{
statement.assign("sys.path.insert(0,\"");
statement.append (path);
statement.append ("\")");
}
else
{
statement.assign("sys.path.append(\"");
statement.append(path);
statement.append("\")");
}
PyRun_SimpleString (statement.c_str());
}
//void
//ScriptInterpreterPython::Terminate ()
//{