Better exception messaging when message is "None"

e.g. SystemExit exception
mcneel · Oct 13, 2023 · 7599ba7 · 7599ba7
1 parent 341f300
commit 7599ba7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/runtime/McNeel.PythonEngine.cs b/src/runtime/McNeel.PythonEngine.cs
@@ -291,15 +291,15 @@ public class PyException : Exception
             public int LineNumber { get; } = -1;
 
             public PyException(PythonException pyEx)
-                : base(pyEx.Message)
+                : base(ParseMessage(pyEx))
             {
                 string traceback = pyEx.Traceback is null ? string.Empty : PythonException.TracebackToString(pyEx.Traceback);
 
                 _pyStackTrace = pyEx.Traceback is null ? string.Empty : string.Join(
                     Environment.NewLine,
                     "Traceback (most recent call last):",
                     traceback,
-                    $"{pyEx.Type.Name}: {pyEx.Message}"
+                    $"{pyEx.Type.Name}: {Message}"
                 );
 
                 Match m = s_msgParser.Matches(traceback)
@@ -314,6 +314,14 @@ public PyException(PythonException pyEx)
             }
 
             public override string ToString() => _pyStackTrace;
+
+            static string ParseMessage(PythonException pyEx)
+            {
+                if (pyEx.Message.Equals("None", StringComparison.InvariantCultureIgnoreCase))
+                    return $"{pyEx.Type.Name} exception";
+
+                return pyEx.Message;
+            }
         }
 
         public int GetLineNumber(object frame) => Runtime.PyFrame_GetLineNumber(((PyObject)frame).Handle);