pythonnet
diff --git a/‎CHANGELOG.md‎
Lines changed: 1 addition & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/embed_tests/TestPythonException.cs‎
Lines changed: 1 addition & 0 deletions b/‎src/embed_tests/TestPythonException.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/embed_tests/pyimport.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/embed_tests/pyimport.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/runtime/assemblymanager.cs‎
Lines changed: 9 additions & 1 deletion b/‎src/runtime/assemblymanager.cs‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎src/runtime/converter.cs‎
Lines changed: 10 additions & 0 deletions b/‎src/runtime/converter.cs‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎src/runtime/extensiontype.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/runtime/extensiontype.cs‎
Lines changed: 1 addition & 1 deletion
@@ -50,6 +50,7 @@ One must now either use enum members (e.g. `MyEnum.Option`), or use enum constru
 -   .NET and Python exceptions are preserved when crossing Python/.NET boundary
 -   BREAKING: custom encoders are no longer called for instances of `System.Type`
 -   `PythonException.Restore` no longer clears `PythonException` instance.
+-   Replaced the old `__import__` hook hack with a PEP302-style Meta Path Loader
 
 ### Fixed
 
 
@@ -178,6 +178,7 @@ public void TestPythonException_Normalize_ThrowsWhenErrorSet()
             var pythonException = PythonException.FetchCurrentRaw();
             Exceptions.SetError(Exceptions.TypeError, "Another error");
             Assert.Throws<InvalidOperationException>(() => pythonException.Normalize());
+            Exceptions.Clear();
         }
     }
 }
@@ -37,7 +37,7 @@ public void SetUp()
             Assert.IsFalse(str == IntPtr.Zero);
             BorrowedReference path = Runtime.Runtime.PySys_GetObject("path");
             Assert.IsFalse(path.IsNull);
-            Runtime.Runtime.PyList_Append(path, str);
+            Runtime.Runtime.PyList_Append(path, new BorrowedReference(str));
             Runtime.Runtime.XDecref(str);
         }
 
 
@@ -37,7 +37,6 @@ internal class AssemblyManager
         // modified from event handlers below, potentially triggered from different .NET threads
         private static ConcurrentQueue<Assembly> assemblies;
         internal static List<string> pypath;
-
         private AssemblyManager()
         {
         }
@@ -312,6 +311,15 @@ public static bool IsValidNamespace(string name)
             return !string.IsNullOrEmpty(name) && namespaces.ContainsKey(name);
         }
 
+        /// <summary>
+        /// Returns an IEnumerable<string> containing the namepsaces exported
+        /// by loaded assemblies in the current app domain.
+        /// </summary>
+        public static IEnumerable<string> GetNamespaces ()
+        {
+            return namespaces.Keys;
+        }
+
         /// <summary>
         /// Returns list of assemblies that declare types in a given namespace
         /// </summary>
 
@@ -202,6 +202,16 @@ internal static IntPtr ToPython(object value, Type type)
                     return ClassDerivedObject.ToPython(pyderived);
             }
 
+            // ModuleObjects are created in a way that their wrapping them as
+            // a CLRObject fails, the ClassObject has no tpHandle. Return the
+            // pyHandle as is, do not convert.
+            if (value is ModuleObject modobj)
+            {
+                var handle = modobj.pyHandle;
+                Runtime.XIncref(handle);
+                return handle;
+            }
+
             // hmm - from Python, we almost never care what the declared
             // type is. we'd rather have the object bound to the actual
             // implementing class.
 
@@ -83,7 +83,7 @@ public static int tp_setattro(IntPtr ob, IntPtr key, IntPtr val)
             {
                 message = "readonly attribute";
             }
-            Exceptions.SetError(Exceptions.TypeError, message);
+            Exceptions.SetError(Exceptions.AttributeError, message);
             return -1;
         }
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ public void TestPythonException_Normalize_ThrowsWhenErrorSet()`
`178`	`178`	`var pythonException = PythonException.FetchCurrentRaw();`
`179`	`179`	`Exceptions.SetError(Exceptions.TypeError, "Another error");`
`180`	`180`	`Assert.Throws<InvalidOperationException>(() => pythonException.Normalize());`
	`181`	`+ Exceptions.Clear();`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void SetUp()`
`37`	`37`	`Assert.IsFalse(str == IntPtr.Zero);`
`38`	`38`	`BorrowedReference path = Runtime.Runtime.PySys_GetObject("path");`
`39`	`39`	`Assert.IsFalse(path.IsNull);`
`40`		`- Runtime.Runtime.PyList_Append(path, str);`
	`40`	`+ Runtime.Runtime.PyList_Append(path, new BorrowedReference(str));`
`41`	`41`	`Runtime.Runtime.XDecref(str);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static int tp_setattro(IntPtr ob, IntPtr key, IntPtr val)`
`83`	`83`	`{`
`84`	`84`	`message = "readonly attribute";`
`85`	`85`	`}`
`86`		`- Exceptions.SetError(Exceptions.TypeError, message);`
	`86`	`+ Exceptions.SetError(Exceptions.AttributeError, message);`
`87`	`87`	`return -1;`
`88`	`88`	`}`
`89`	`89`