pythonnet
diff --git a/‎src/domain_tests/TestRunner.cs
Lines changed: 23 additions & 0 deletions b/‎src/domain_tests/TestRunner.cs
Lines changed: 23 additions & 0 deletions
diff --git a/‎src/domain_tests/test_domain_reload.py
Lines changed: 4 additions & 0 deletions b/‎src/domain_tests/test_domain_reload.py
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/runtime/assemblymanager.cs
Lines changed: 23 additions & 0 deletions b/‎src/runtime/assemblymanager.cs
Lines changed: 23 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
@@ -1092,6 +1092,29 @@ assert sys.my_obj is not None
     foo = sys.my_obj.Inner()
     print(foo)
     
+                    ",
+            },
+            new TestCase
+            {
+                // The C# code for this test doesn't matter; we're testing
+                // that the import hook behaves properly after a domain reload
+                Name = "import_after_reload",
+                DotNetBefore = "",
+                DotNetAfter = "",
+                PythonCode = @"
+import sys
+
+def before_reload():
+    import clr
+    import System
+
+
+def after_reload():
+    assert 'System' in sys.modules
+    assert 'clr' in sys.modules
+    import clr
+    import System
+    
                     ",
             },
         };
 
@@ -98,3 +98,7 @@ def test_in_to_ref_param():
 @pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
 def test_nested_type():
     _run_test("nested_type")
+
+@pytest.mark.skipif(platform.system() == 'Darwin', reason='FIXME: macos can\'t find the python library')
+def test_import_after_reload():
+    _run_test("import_after_reload")
@@ -37,6 +37,9 @@ internal class AssemblyManager
         // modified from event handlers below, potentially triggered from different .NET threads
         private static ConcurrentQueue<Assembly> assemblies;
         internal static List<string> pypath;
+        
+        // Triggered when a new namespace is added to the namespaces dictionary
+        public static event Action<string> namespaceAdded;
 
         private AssemblyManager()
         {
@@ -284,6 +287,17 @@ internal static void ScanAssembly(Assembly assembly)
                 if (ns != null)
                 {
                     namespaces[ns].TryAdd(assembly, string.Empty);
+                    try
+                    {
+                        namespaceAdded?.Invoke(ns);
+                    }
+                    catch (Exception e)
+                    {
+                        // For some reason, exceptions happening here does... nothing.
+                        // Even System.AccessViolationExceptions gets ignored.
+                        Console.WriteLine($"Namespace added callback failed with: {e}");
+                        throw;
+                    }
                 }
 
                 if (ns != null && t.IsGenericTypeDefinition)
@@ -312,6 +326,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>
 
@@ -76,7 +76,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
`@@ -76,7 +76,7 @@ public static int tp_setattro(IntPtr ob, IntPtr key, IntPtr val)`
`76`	`76`	`{`
`77`	`77`	`message = "readonly attribute";`
`78`	`78`	`}`
`79`		`- Exceptions.SetError(Exceptions.TypeError, message);`
	`79`	`+ Exceptions.SetError(Exceptions.AttributeError, message);`
`80`	`80`	`return -1;`
`81`	`81`	`}`
`82`	`82`