refactor: pass exception object to log_env_details

mandiant · Apr 29, 2024 · b2a99cc · b2a99cc
1 parent 46f45fd
commit b2a99cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/data/python/jepeval.py b/data/python/jepeval.py
@@ -82,6 +82,6 @@ def _jepeval(line):
         import jeputils
 
         traceback.print_exc()
-        jeputils.log_env_details(type(err))
+        jeputils.log_env_details(err)
 
     return more_input_needed
diff --git a/data/python/jeprunscript.py b/data/python/jeprunscript.py
@@ -39,4 +39,4 @@ def jep_runscript(path):
         import jeputils
 
         traceback.print_exc()
-        jeputils.log_env_details(type(err))
+        jeputils.log_env_details(err)
diff --git a/data/python/jeputils.py b/data/python/jeputils.py
@@ -5,11 +5,12 @@
 import ghidrathon
 from java.lang import System
 
-ALLOWED_EXCEPTIONS = [RuntimeError, OSError]
+ALLOWED_EXCEPTIONS = (RuntimeError, OSError)
 
 
-def log_env_details(exc_type):
-    if any(issubclass(exc_type, exc_class) for exc_class in ALLOWED_EXCEPTIONS):
+def log_env_details(exc):
+    exc_type = type(exc)
+    if issubclass(exc_type, ALLOWED_EXCEPTIONS):
         print(
             f"Python={platform.python_version()}, "
             f"Arch={System.getProperty('os.arch')}, "