pythonnet
diff --git a/‎src/embed_tests/TestPythonException.cs
Lines changed: 3 additions & 3 deletions b/‎src/embed_tests/TestPythonException.cs
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/runtime/pythonexception.cs
Lines changed: 22 additions & 17 deletions b/‎src/runtime/pythonexception.cs
Lines changed: 22 additions & 17 deletions
@@ -72,8 +72,8 @@ public void TestPythonExceptionFormat()
         [Test]
         public void TestPythonExceptionFormatNoError()
         {
-            var e = new PythonException();
-            Assert.AreEqual("Missing exception/traceback information", e.Format());
+            var ex = new PythonException();
+            Assert.AreEqual(ex.StackTrace, ex.Format());
         }
 
         [Test]
@@ -87,7 +87,7 @@ public void TestPythonExceptionFormatNoTraceback()
             catch (PythonException ex)
             {
                 // ImportError/ModuleNotFoundError do not have a traceback when not running in a script 
-                Assert.AreEqual("Missing exception/traceback information", ex.Format());
+                Assert.AreEqual(ex.StackTrace, ex.Format());
             }
         }
     }
@@ -154,31 +154,36 @@ public string Format()
         {
             string res;
             IntPtr gs = PythonEngine.AcquireLock();
-            if (_pyTB != IntPtr.Zero && _pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)
+            try
             {
-                Runtime.XIncref(_pyType);
-                Runtime.XIncref(_pyValue);
-                Runtime.XIncref(_pyTB);
-                using (PyObject pyType = new PyObject(_pyType))
-                using (PyObject pyValue = new PyObject(_pyValue))
-                using (PyObject pyTB = new PyObject(_pyTB))
-                using (PyObject tb_mod = PythonEngine.ImportModule("traceback"))
+                if (_pyTB != IntPtr.Zero && _pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)
                 {
-                    var buffer = new StringBuilder();
-                    var values = tb_mod.InvokeMethod("format_exception", pyType, pyValue, pyTB);
-                    Runtime.PyErr_Clear();
-                    foreach (PyObject val in values)
+                    Runtime.XIncref(_pyType);
+                    Runtime.XIncref(_pyValue);
+                    Runtime.XIncref(_pyTB);
+                    using (PyObject pyType = new PyObject(_pyType))
+                    using (PyObject pyValue = new PyObject(_pyValue))
+                    using (PyObject pyTB = new PyObject(_pyTB))
+                    using (PyObject tb_mod = PythonEngine.ImportModule("traceback"))
                     {
-                        buffer.Append(val.ToString());
+                        var buffer = new StringBuilder();
+                        var values = tb_mod.InvokeMethod("format_exception", pyType, pyValue, pyTB);
+                        foreach (PyObject val in values)
+                        {
+                            buffer.Append(val.ToString());
+                        }
                     }
-                    res = buffer.ToString();
+                }
+                else
+                {
+                    res = StackTrace;
                 }
             }
-            else
+            finally
             {
-                res = "Missing exception/traceback information";
+                PythonEngine.ReleaseLock(gs);
             }
-            PythonEngine.ReleaseLock(gs);
             return res;
         }
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ public void TestPythonExceptionFormat()`
`72`	`72`	`[Test]`
`73`	`73`	`public void TestPythonExceptionFormatNoError()`
`74`	`74`	`{`
`75`		`- var e = new PythonException();`
`76`		`- Assert.AreEqual("Missing exception/traceback information", e.Format());`
	`75`	`+ var ex = new PythonException();`
	`76`	`+ Assert.AreEqual(ex.StackTrace, ex.Format());`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`[Test]`
`@@ -87,7 +87,7 @@ public void TestPythonExceptionFormatNoTraceback()`
`87`	`87`	`catch (PythonException ex)`
`88`	`88`	`{`
`89`	`89`	`// ImportError/ModuleNotFoundError do not have a traceback when not running in a script`
`90`		`- Assert.AreEqual("Missing exception/traceback information", ex.Format());`
	`90`	`+ Assert.AreEqual(ex.StackTrace, ex.Format());`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,31 +154,36 @@ public string Format()`
`154`	`154`	`{`
`155`	`155`	`string res;`
`156`	`156`	`IntPtr gs = PythonEngine.AcquireLock();`
`157`		`- if (_pyTB != IntPtr.Zero && _pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)`
	`157`	`+ try`
`158`	`158`	`{`
`159`		`- Runtime.XIncref(_pyType);`
`160`		`- Runtime.XIncref(_pyValue);`
`161`		`- Runtime.XIncref(_pyTB);`
`162`		`- using (PyObject pyType = new PyObject(_pyType))`
`163`		`- using (PyObject pyValue = new PyObject(_pyValue))`
`164`		`- using (PyObject pyTB = new PyObject(_pyTB))`
`165`		`- using (PyObject tb_mod = PythonEngine.ImportModule("traceback"))`
	`159`	`+ if (_pyTB != IntPtr.Zero && _pyType != IntPtr.Zero && _pyValue != IntPtr.Zero)`
`166`	`160`	`{`
`167`		`- var buffer = new StringBuilder();`
`168`		`- var values = tb_mod.InvokeMethod("format_exception", pyType, pyValue, pyTB);`
`169`		`- Runtime.PyErr_Clear();`
`170`		`- foreach (PyObject val in values)`
	`161`	`+ Runtime.XIncref(_pyType);`
	`162`	`+ Runtime.XIncref(_pyValue);`
	`163`	`+ Runtime.XIncref(_pyTB);`
	`164`	`+ using (PyObject pyType = new PyObject(_pyType))`
	`165`	`+ using (PyObject pyValue = new PyObject(_pyValue))`
	`166`	`+ using (PyObject pyTB = new PyObject(_pyTB))`
	`167`	`+ using (PyObject tb_mod = PythonEngine.ImportModule("traceback"))`
`171`	`168`	`{`
`172`		`- buffer.Append(val.ToString());`
	`169`	`+ var buffer = new StringBuilder();`
	`170`	`+ var values = tb_mod.InvokeMethod("format_exception", pyType, pyValue, pyTB);`
	`171`	`+ foreach (PyObject val in values)`
	`172`	`+ {`
	`173`	`+ buffer.Append(val.ToString());`
	`174`	`+ }`
	`175`	`+ res = buffer.ToString();`
`173`	`176`	`}`
`174`		`- res = buffer.ToString();`
	`177`	`+ }`
	`178`	`+ else`
	`179`	`+ {`
	`180`	`+ res = StackTrace;`
`175`	`181`	`}`
`176`	`182`	`}`
`177`		`- else`
	`183`	`+ finally`
`178`	`184`	`{`
`179`		`- res = "Missing exception/traceback information";`
	`185`	`+ PythonEngine.ReleaseLock(gs);`
`180`	`186`	`}`
`181`		`- PythonEngine.ReleaseLock(gs);`
`182`	`187`	`return res;`
`183`	`188`	`}`
`184`	`189`