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

[lldb] Unconditionally strip the .py(c) extension when loading a module

Browse Source 
Currently we only strip the Python extension when the file exists on
disk because we assumed that if it didn't exist it was a module.
However, with the change from D89334 this is no longer the case as we
want to be able to import a relative path to a .py as a module. Since we
always import a scripting module as a "python module" we should always
strip the extension if present.

Differential revision: https://reviews.llvm.org/D89352
This commit is contained in:
Jonas Devlieghere
2020-10-13 21:08:37 -07:00
parent 625fa47617
commit 1197ee35b8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
View File

@@ -2797,19 +2797,20 @@ bool ScriptInterpreterPythonImpl::LoadScriptingModule(
return false;
}
// strip .py or .pyc extension
ConstString extension = target_file.GetFileNameExtension();
if (extension) {
if (llvm::StringRef(extension.GetCString()) == ".py")
basename.resize(basename.length() - 3);
else if (llvm::StringRef(extension.GetCString()) == ".pyc")
basename.resize(basename.length() - 4);
}
} else {
error.SetErrorString("no known way to import this module specification");
return false;
}
// Strip .py or .pyc extension
llvm::StringRef extension = target_file.GetFileNameExtension().GetCString();
if (!extension.empty()) {
if (extension == ".py")
basename.resize(basename.length() - 3);
else if (extension == ".pyc")
basename.resize(basename.length() - 4);
}
// check if the module is already import-ed
command_stream.Clear();
command_stream.Printf("sys.modules.__contains__('%s')", basename.c_str());