Commit31236b5

committed

ImportHook preserves the original exception message when an import fails

1 parentfc47172 commit31236b5Copy full SHA for 31236b5

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,9 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`291`	`291`	`// We don't support them anyway`
`292`	`292`	`returnIntPtr.Zero;`
`293`	`293`	`}`
	`294`	`+// Save the exception`
	`295`	`+varoriginalException=newPythonException();`
	`296`	`+varoriginalExceptionMessage=originalException.ToString();`
`294`	`297`	`// Otherwise, just clear the it.`
`295`	`298`	`Exceptions.Clear();`
`296`	`299`
`@@ -342,7 +345,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`342`	`345`	`ManagedTypemt=tail.GetAttribute(name,true);`
`343`	`346`	`if(!(mtisModuleObject))`
`344`	`347`	`{`
`345`		`-Exceptions.SetError(Exceptions.ImportError,$"No module named{name}");`
	`348`	`+Exceptions.SetError(Exceptions.ImportError,originalExceptionMessage);`
`346`	`349`	`returnIntPtr.Zero;`
`347`	`350`	`}`
`348`	`351`	`if(head==null)`

Comments

(0)