Fix a bug where clr wasn't in sys.modules after reload

BadSingleton · BadSingleton · commit afffc187515f · 2021-06-02T10:56:48.000-04:00
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -109,6 +109,9 @@ internal static void RestoreRuntimeData(RuntimeDataStorage storage)
             storage.GetValue("py_clr_module", out py_clr_module);
             var rootHandle = storage.GetValue<IntPtr>("root");
             root = (CLRModule)ManagedType.GetManagedObject(rootHandle);
+            IntPtr dict = Runtime.PyImport_GetModuleDict();
+            Runtime.PyDict_SetItemString(dict, "CLR", py_clr_module);
+            Runtime.PyDict_SetItemString(dict, "clr", py_clr_module);
             SetupNamespaceTracking();
         }
 
diff --git a/tests/domain_tests/TestRunner.cs b/tests/domain_tests/TestRunner.cs
@@ -1092,6 +1092,46 @@ 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.
+                Name = "import_after_reload",
+                DotNetBefore = @"
+                    namespace TestNamespace
+                    {
+                        [System.Serializable]
+                        public class Cls
+                        {
+                        }
+                    }",
+                DotNetAfter = @"
+                    namespace TestNamespace
+                    {
+                        [System.Serializable]
+                        public class WithNestedType
+                        {
+                            [System.Serializable]
+                            public class Cls
+                            {
+                            }
+                        }
+                    }",
+                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
+    
                     ",
             },
         };
diff --git a/tests/domain_tests/test_domain_reload.py b/tests/domain_tests/test_domain_reload.py
@@ -88,3 +88,7 @@ def test_in_to_ref_param():
 
 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")

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@ internal static void RestoreRuntimeData(RuntimeDataStorage storage)`
`109`	`109`	`storage.GetValue("py_clr_module", out py_clr_module);`
`110`	`110`	`var rootHandle = storage.GetValue<IntPtr>("root");`
`111`	`111`	`root = (CLRModule)ManagedType.GetManagedObject(rootHandle);`
	`112`	`+ IntPtr dict = Runtime.PyImport_GetModuleDict();`
	`113`	`+ Runtime.PyDict_SetItemString(dict, "CLR", py_clr_module);`
	`114`	`+ Runtime.PyDict_SetItemString(dict, "clr", py_clr_module);`
`112`	`115`	`SetupNamespaceTracking();`
`113`	`116`	`}`
`114`	`117`