Merge branch 'GP-7001_ryanmkurtz_pyghidra' (Closes #9288)

Ghidra/Features/PyGhidra/src/main/java/ghidra/pyghidra/PyGhidraScriptProvider.java

@@ -99,8 +99,16 @@ public final class PyGhidraScriptProvider extends AbstractPythonScriptProvider {
 			implements PythonFieldExposer {
 
 		@Override
-		public void run() {
-			scriptRunner.accept(this);
+		public void run() throws Exception {
+			try {
+				scriptRunner.accept(this);
+			}
+			catch (Exception e) {
+				// This is a PyExceptionProxy, which we unfortunately cannot add a custom message 
+				// to. We don't want to wrap it in a custom exception because then Python will lose
+				// access to the original BaseException.
+				throw e;
+			}
 		}
 
 		/**

Ghidra/Features/PyGhidra/src/main/py/README.md

@@ -571,6 +571,7 @@ __3.2.0__
 * PyGhidra's `help()` override can now show `public/private/protected` on Ghidra Java fields and 
   methods (available in Ghidra 12.2 and later).
 * When an uncaught `JException` occurs, PyGhidra will now output the full Java stack trace.
+* PyGhidra no longer swallows the original exception object generated by GhidraScripts.
 
 __3.1.0__
 * PyGhidra will now, by default, restore `sys.modules` to its prior state after a PyGhidra script is

Ghidra/Features/PyGhidra/src/main/py/src/pyghidra/script.py

@@ -256,6 +256,7 @@ class PyGhidraScript(dict):
             # pylint: disable=bare-except
             except:
                 print_stacktrace(self._script, script_path)
+                raise
         finally:
             sys.argv = orig_argv