Keep the clr module dictionary up to date in Python 3.

tonyroberts · tonyroberts · commit f8db1b8906e0 · 2014-11-05T17:22:22.000Z
Track assemblies with types in no namespace as well as those in
namespaces.
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -291,8 +291,8 @@ internal static void ScanAssembly(Assembly assembly) {
             Type[] types = assembly.GetTypes();
             for (int i = 0; i < types.Length; i++) {
                 Type t = types[i];
-                string ns = t.Namespace;
-                if ((ns != null) && (!namespaces.ContainsKey(ns))) {
+                string ns = t.Namespace ?? "";
+                if (!namespaces.ContainsKey(ns)) {
                     string[] names = ns.Split('.');
                     string s = "";
                     for (int n = 0; n < names.Length; n++) {
@@ -367,7 +367,7 @@ public static List<string> GetNames(string nsname) {
                     Type[] types = a.GetTypes();
                     for (int i = 0; i < types.Length; i++) {
                         Type t = types[i];
-                        if (t.Namespace == nsname) {
+                        if ((t.Namespace ?? "") == nsname) {
                             names.Add(t.Name);
                         }
                     }
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -92,9 +92,44 @@ internal static void Shutdown() {
         //===================================================================
         // Return the clr python module (new reference)
         //===================================================================
-        public static IntPtr GetCLRModule() {
+        public static IntPtr GetCLRModule(IntPtr? fromList=null) {
             root.InitializePreload();
 #if (PYTHON32 || PYTHON33 || PYTHON34)
+            // update the module dictionary with the contents of the root dictionary
+            root.LoadNames();
+            IntPtr py_mod_dict = Runtime.PyModule_GetDict(py_clr_module);
+            IntPtr clr_dict = Runtime._PyObject_GetDictPtr(root.pyHandle); // PyObject**
+            clr_dict = (IntPtr)Marshal.PtrToStructure(clr_dict, typeof(IntPtr));
+            Runtime.PyDict_Update(py_mod_dict, clr_dict);
+
+            // find any items from the fromlist and get them from the root if they're not
+            // aleady in the module dictionary
+            if (fromList != null && fromList != IntPtr.Zero) {
+                if (Runtime.PyTuple_Check(fromList.GetValueOrDefault()))
+                {
+                    Runtime.Incref(py_mod_dict);
+                    PyDict mod_dict = new PyDict(py_mod_dict);
+
+                    Runtime.Incref(fromList.GetValueOrDefault());
+                    PyTuple from = new PyTuple(fromList.GetValueOrDefault());
+                    foreach (PyObject item in from) {
+                        if (mod_dict.HasKey(item))
+                            continue;
+
+                        string s = item.AsManagedObject(typeof(string)) as string;
+                        if (null == s)
+                            continue;
+
+                        ManagedType attr = root.GetAttribute(s, true);
+                        if (null == attr)
+                            continue;
+
+                        Runtime.Incref(attr.pyHandle);
+                        mod_dict.SetItem(s, new PyObject(attr.pyHandle));
+                    }
+                }
+            }
+
             Runtime.Incref(py_clr_module);
             return py_clr_module;
 #else
@@ -145,12 +180,12 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw) {
             // do the Incref()ed return here, since we've already found
             // the module.
             if (mod_name == "clr") {
-                return GetCLRModule();
+                return GetCLRModule(fromList);
             }
             if (mod_name == "CLR") {
                 Exceptions.deprecation("The CLR module is deprecated. " +
                     "Please use 'clr'.");
-                return GetCLRModule();
+                return GetCLRModule(fromList);
             }
             string realname = mod_name;
             if (mod_name.StartsWith("CLR.")) {
