Revert "GP-5298: PyGhidra can now find modules that live in directories specified by the Bundle Manager"

This reverts commit c5d4444128.
This commit is contained in:
ghidra1 2025-02-05 14:21:55 -05:00
parent e840596b39
commit 1bccb8ac60

View file

@ -109,17 +109,6 @@ class _PyGhidraImportLoader:
def exec_module(self, fullname):
pass
class _GhidraBundleFinder(importlib.machinery.PathFinder):
""" (internal) Used to find modules in Ghidra bundle locations """
def find_spec(self, fullname, path=None, target=None):
from ghidra.app.script import GhidraScriptUtil
GhidraScriptUtil.acquireBundleHostReference()
for directory in GhidraScriptUtil.getEnabledScriptSourceDirectories():
spec = super().find_spec(fullname, [directory.absolutePath], target)
if spec is not None:
return spec
return None
@contextlib.contextmanager
def _plugin_lock():
@ -401,9 +390,8 @@ class PyGhidraLauncher:
**jpype_kwargs
)
# Install hooks into python importlib
# Install hook into python importlib
sys.meta_path.append(_PyGhidraImportLoader())
sys.meta_path.append(_GhidraBundleFinder())
imports.registerDomain("ghidra")