Fix "from import *" after a normal import

amos402 · filmor · commit ba0602a4c211 · 2018-10-17T10:17:57.000+02:00
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -184,6 +184,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                 }
             }
 
+            ModuleObject mod;
             string mod_name = Runtime.GetManagedString(py_mod_name);
             // Check these BEFORE the built-in import runs; may as well
             // do the Incref()ed return here, since we've already found
@@ -237,6 +238,11 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                 if (res != IntPtr.Zero)
                 {
                     // There was no error.
+                    if (fromlist && IsLoadAll(fromList))
+                    {
+                        mod = ManagedType.GetManagedObject(res) as ModuleObject;
+                        mod?.LoadNames();
+                    }
                     return res;
                 }
                 // There was an error
@@ -290,6 +296,11 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             {
                 if (fromlist)
                 {
+                    if (IsLoadAll(fromList))
+                    {
+                        mod = ManagedType.GetManagedObject(module) as ModuleObject;
+                        mod?.LoadNames();
+                    }
                     Runtime.XIncref(module);
                     return module;
                 }
@@ -345,20 +356,31 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
                 }
             }
 
-            ModuleObject mod = fromlist ? tail : head;
+            mod = fromlist ? tail : head;
 
-            if (fromlist && Runtime.PySequence_Size(fromList) == 1)
+            if (fromlist && IsLoadAll(fromList))
             {
-                IntPtr fp = Runtime.PySequence_GetItem(fromList, 0);
-                if (!CLRModule.preload && Runtime.GetManagedString(fp) == "*")
-                {
-                    mod.LoadNames();
-                }
-                Runtime.XDecref(fp);
+                mod.LoadNames();
             }
 
             Runtime.XIncref(mod.pyHandle);
             return mod.pyHandle;
         }
+
+        private static bool IsLoadAll(IntPtr fromList)
+        {
+            if (CLRModule.preload)
+            {
+                return false;
+            }
+            if (Runtime.PySequence_Size(fromList) != 1)
+            {
+                return false;
+            }
+            IntPtr fp = Runtime.PySequence_GetItem(fromList, 0);
+            bool res = Runtime.GetManagedString(fp) == "*";
+            Runtime.XDecref(fp);
+            return res;
+        }
     }
 }
diff --git a/src/tests/importtest.py b/src/tests/importtest.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+import sys
+try:
+    del sys.modules["System.IO"]
+except KeyError:
+    pass
+
+assert "FileStream" not in globals()
+import System.IO
+from System.IO import *
+
+assert "FileStream" in globals()
diff --git a/src/tests/test_import.py b/src/tests/test_import.py
@@ -3,11 +3,17 @@
 """Test the import statement."""
 
 import pytest
-
+import sys
 
 def test_relative_missing_import():
     """Test that a relative missing import doesn't crash.
     Some modules use this to check if a package is installed.
     Relative import in the site-packages folder"""
     with pytest.raises(ImportError):
         from . import _missing_import
+
+
+def test_import_all_on_second_time():
+    from . import importtest
+    del sys.modules[importtest.__name__]
+    

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ ModuleObject mod;`
`187`	`188`	`string mod_name = Runtime.GetManagedString(py_mod_name);`
`188`	`189`	`// Check these BEFORE the built-in import runs; may as well`
`189`	`190`	`// do the Incref()ed return here, since we've already found`
`@@ -237,6 +238,11 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`237`	`238`	`if (res != IntPtr.Zero)`
`238`	`239`	`{`
`239`	`240`	`// There was no error.`
	`241`	`+ if (fromlist && IsLoadAll(fromList))`
	`242`	`+ {`
	`243`	`+ mod = ManagedType.GetManagedObject(res) as ModuleObject;`
	`244`	`+ mod?.LoadNames();`
	`245`	`+ }`
`240`	`246`	`return res;`
`241`	`247`	`}`
`242`	`248`	`// There was an error`
`@@ -290,6 +296,11 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`290`	`296`	`{`
`291`	`297`	`if (fromlist)`
`292`	`298`	`{`
	`299`	`+ if (IsLoadAll(fromList))`
	`300`	`+ {`
	`301`	`+ mod = ManagedType.GetManagedObject(module) as ModuleObject;`
	`302`	`+ mod?.LoadNames();`
	`303`	`+ }`
`293`	`304`	`Runtime.XIncref(module);`
`294`	`305`	`return module;`
`295`	`306`	`}`
`@@ -345,20 +356,31 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`345`	`356`	`}`
`346`	`357`	`}`
`347`	`358`
`348`		`- ModuleObject mod = fromlist ? tail : head;`
	`359`	`+ mod = fromlist ? tail : head;`
`349`	`360`
`350`		`- if (fromlist && Runtime.PySequence_Size(fromList) == 1)`
	`361`	`+ if (fromlist && IsLoadAll(fromList))`
`351`	`362`	`{`
`352`		`- IntPtr fp = Runtime.PySequence_GetItem(fromList, 0);`
`353`		`- if (!CLRModule.preload && Runtime.GetManagedString(fp) == "*")`
`354`		`- {`
`355`		`- mod.LoadNames();`
`356`		`- }`
`357`		`- Runtime.XDecref(fp);`
	`363`	`+ mod.LoadNames();`
`358`	`364`	`}`
`359`	`365`
`360`	`366`	`Runtime.XIncref(mod.pyHandle);`
`361`	`367`	`return mod.pyHandle;`
`362`	`368`	`}`
	`369`	`+`
	`370`	`+ private static bool IsLoadAll(IntPtr fromList)`
	`371`	`+ {`
	`372`	`+ if (CLRModule.preload)`
	`373`	`+ {`
	`374`	`+ return false;`
	`375`	`+ }`
	`376`	`+ if (Runtime.PySequence_Size(fromList) != 1)`
	`377`	`+ {`
	`378`	`+ return false;`
	`379`	`+ }`
	`380`	`+ IntPtr fp = Runtime.PySequence_GetItem(fromList, 0);`
	`381`	`+ bool res = Runtime.GetManagedString(fp) == "*";`
	`382`	`+ Runtime.XDecref(fp);`
	`383`	`+ return res;`
	`384`	`+ }`
`363`	`385`	`}`
`364`	`386`	`}`