Use PythonException.Restore

tminka · tminka · commit 0a88f27fa199 · 2021-01-05T00:27:36.000Z
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -293,7 +293,6 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             }
             // Save the exception
             var originalException = new PythonException();
-            var originalExceptionMessage = originalException.ToString();
             // Otherwise,  just clear the it.
             Exceptions.Clear();
 
@@ -345,7 +344,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                 ManagedType mt = tail.GetAttribute(name, true);
                 if (!(mt is ModuleObject))
                 {
-                    Exceptions.SetError(Exceptions.ImportError, originalExceptionMessage);
+                    originalException.Restore();
                     return IntPtr.Zero;
                 }
                 if (head == null)

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,6 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`293`	`293`	`}`
`294`	`294`	`// Save the exception`
`295`	`295`	`var originalException = new PythonException();`
`296`		`- var originalExceptionMessage = originalException.ToString();`
`297`	`296`	`// Otherwise, just clear the it.`
`298`	`297`	`Exceptions.Clear();`
`299`	`298`
`@@ -345,7 +344,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`345`	`344`	`ManagedType mt = tail.GetAttribute(name, true);`
`346`	`345`	`if (!(mt is ModuleObject))`
`347`	`346`	`{`
`348`		`- Exceptions.SetError(Exceptions.ImportError, originalExceptionMessage);`
	`347`	`+ originalException.Restore();`
`349`	`348`	`return IntPtr.Zero;`
`350`	`349`	`}`
`351`	`350`	`if (head == null)`