codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-05 18:14:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1861 from narfindustries/1501-ja-core-python

Browse Source 
1501 ja core python
This commit is contained in:
Richard Cordovano
2016-01-30 08:25:07 -05:00
parent f797f913e6 36c8c47b8b
commit c2301caeff
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties Normal file
View File

4
Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java
View File

@@ -74,7 +74,7 @@ public final class JythonModuleLoader {
// add python modules from 'autospy/build/cluster/InternalPythonModules' folder
// which are copied from 'autopsy/*/release/InternalPythonModules' folders.
for (File f : InstalledFileLocator.getDefault().locateAll("InternalPythonModules", JythonModuleLoader.class.getPackage().getName(), false)) {
for (File f : InstalledFileLocator.getDefault().locateAll("InternalPythonModules", JythonModuleLoader.class.getPackage().getName(), false)) { //NON-NLS
Collections.addAll(pythonModuleDirs, f.listFiles());
}
// add python modules from 'testuserdir/python_modules' folder
@@ -127,7 +127,7 @@ public final class JythonModuleLoader {
interpreter.exec("reload(" + moduleName + ")"); //NON-NLS
// Importing the appropriate class from the Py Script which contains multiple classes.
interpreter.exec("from " + moduleName + " import " + className);
interpreter.exec("from " + moduleName + " import " + className); //NON-NLS
interpreter.exec("obj = " + className + "()"); //NON-NLS
T obj = interpreter.get("obj", interfaceClass); //NON-NLS