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

BadSingleton · BadSingleton · commit b2fa5ccf3dc1 · 2021-01-18T16:17:25.000-05:00
diff --git a/src/domain_tests/TestRunner.cs b/src/domain_tests/TestRunner.cs
@@ -888,6 +888,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/src/domain_tests/test_domain_reload.py b/src/domain_tests/test_domain_reload.py
@@ -86,3 +86,7 @@ def test_out_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")
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -134,6 +134,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();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,9 @@ internal static void RestoreRuntimeData(RuntimeDataStorage storage)`
`134`	`134`	`storage.GetValue("py_clr_module", out py_clr_module);`
`135`	`135`	`var rootHandle = storage.GetValue<IntPtr>("root");`
`136`	`136`	`root = (CLRModule)ManagedType.GetManagedObject(rootHandle);`
	`137`	`+ IntPtr dict = Runtime.PyImport_GetModuleDict();`
	`138`	`+ Runtime.PyDict_SetItemString(dict, "CLR", py_clr_module);`
	`139`	`+ Runtime.PyDict_SetItemString(dict, "clr", py_clr_module);`
`137`	`140`	`SetupNamespaceTracking();`
`138`	`141`	`}`
`139`	`142`