yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-3619: Updating python path more frequently to account for changes

Browse source 
from bundle manager
This commit is contained in:
Ryan Kurtz 2023-07-13 08:47:55 -04:00
parent 6b78b71940
commit 995bb26a4d
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Ghidra/Features/Python/src/main/java/ghidra/python/GhidraPythonInterpreter.java
View file

@ -121,8 +121,6 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
// Add __builtin__ module for code completion
builtinModule = (PyModule) imp.load("__builtin__");
initializePythonPath();
}
/**
@ -134,7 +132,7 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
systemState.path.retainAll(defaultPythonPath);
// Add in Ghidra script source directories
for (ResourceFile resourceFile : GhidraScriptUtil.getScriptSourceDirectories()) {
for (ResourceFile resourceFile : GhidraScriptUtil.getEnabledScriptSourceDirectories()) {
systemState.path.append(Py.newStringOrUnicode(resourceFile.getFile(false).getAbsolutePath()));
}
@ -168,6 +166,7 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
"Ghidra python interpreter has already been cleaned up.");
}
initializePythonPath();
injectScriptHierarchy(script);
if (buffer.length() > 0) {
@ -207,6 +206,7 @@ public class GhidraPythonInterpreter extends InteractiveInterpreter {
"Ghidra python interpreter has already been cleaned up.");
}
initializePythonPath();
injectScriptHierarchy(script);
Py.getThreadState().tracefunc = interruptTraceFunction;