Fix pyscripter#292

pyscripter · pyscripter · commit cd992722511b · 2021-03-01T02:46:32.000+02:00
diff --git a/Source/PythonEngine.pas b/Source/PythonEngine.pas
@@ -1334,7 +1334,7 @@   TPythonInterface=class(TDynamicDll)
     PyErr_BadInternalCall: procedure; cdecl;
     PyErr_CheckSignals: function: integer; cdecl;
     PyErr_Clear:        procedure; cdecl;
-    PyErr_Fetch:        procedure( errtype, errvalue, errtraceback: PPPyObject); cdecl;
+    PyErr_Fetch:        procedure(out errtype, errvalue, errtraceback: PPyObject); cdecl;
     PyErr_NoMemory:     function: PPyObject; cdecl;
     PyErr_Occurred:     function: PPyObject; cdecl;
     PyErr_Print:        procedure; cdecl;
@@ -1732,7 +1732,7 @@   TPythonTraceback = class
       destructor Destroy; override;
 
       procedure Clear;
-      procedure Refresh;
+      procedure Refresh(pytraceback: PPyObject = nil);
       procedure AddItem(const Context, FileName: string; LineNo: Integer);
 
       property ItemCount : Integer read GetItemCount;
@@ -2740,6 +2740,8 @@ implementation
 (*******************************************************)
 resourcestring
 SPyConvertionError = 'Conversion Error: %s expects a %s Python object';
+SPyExcStopIteration = 'Stop Iteration';
+SPyExcSystemError = 'Unhandled SystemExit exception. Code: %s';
 
 (*******************************************************)
 (**                                                   **)
@@ -3853,7 +3855,7 @@ procedure TPythonTraceback.Clear;
  * simply use the method CheckError wich will call PyErr_Print,
  * Traceback.Refresh and RaiseError for you.
 }
-procedure TPythonTraceback.Refresh;
+procedure TPythonTraceback.Refresh(pytraceback: PPyObject);
 var
   tb, tb1  : PPyObject;
   obj      : PPyObject;
@@ -3872,7 +3874,9 @@ procedure TPythonTraceback.Refresh;
       limitv := PySys_GetObject('tracebacklimit');
       if Assigned(limitv) and PyLong_Check(limitv) then
         alimit := PyLong_AsLong(limitv);
-      tb := PySys_GetObject('last_traceback');
+      tb := pytraceback;
+      if tb = nil then
+        tb := PySys_GetObject('last_traceback');
       tb1 := tb;
       Py_XIncRef(tb1);
       depth := 0;
@@ -4466,10 +4470,9 @@ function TPythonEngine.EvalPyFunction(pyfunc, pyargs:PPyObject): Variant;
     presult := PyEval_CallObjectWithKeywords(pyfunc,pyargs, nil);
     CheckError(False);
     if presult = nil then
-      begin
-        PyErr_Print;
-        RaiseError;
-      end
+      // should not happen since an exception would have been raised
+      // in that case by CheckError
+      Result := Null
     else
       begin
         try
@@ -5774,14 +5777,32 @@ procedure TPythonEngine.ListToSet( List : PPyObject; data : Pointer; size : Inte
 end;
 
 procedure TPythonEngine.CheckError(ACatchStopEx : Boolean = False);
+  procedure ProcessSystemExit;
+  var
+    errtype, errvalue, errtraceback: PPyObject;
+    SErrValue: string;
+  begin
+    PyErr_Fetch(errtype, errvalue, errtraceback);
+    Traceback.Refresh(errtraceback);
+    SErrValue := PyObjectAsString(errvalue);
+    PyErr_Clear;
+    raise EPySystemExit.CreateResFmt(@SPyExcSystemError, [SErrValue]);
+  end;
+
+var
+  PyException: PPyObject;
 begin
-  if PyErr_Occurred <> nil then
+  PyException := PyErr_Occurred;
+  if PyException <> nil then
   begin
-    if ACatchStopEx and (PyErr_GivenExceptionMatches(PyErr_Occurred, PyExc_StopIteration^) <> 0) then
+    if ACatchStopEx and (PyErr_GivenExceptionMatches(PyException, PyExc_StopIteration^) <> 0) then
     begin
       PyErr_Clear;
-      raise EPyStopIteration.Create('Stop iteration');
+      raise EPyStopIteration.CreateRes(@SPyExcStopIteration);
     end
+    else if PyErr_GivenExceptionMatches(PyException, PyExc_SystemExit^) <> 0 then
+    // Special treatment for SystemExit.  Calling PyErr_Print would terminate the process
+      ProcessSystemExit
     else
     begin
       PyErr_Print;
