Create a new module for importing the embedded clr.py file into as the

tonyroberts · tonyroberts · commit 5354bc9ac5ac · 2014-11-05T10:09:25.000Z
globals dictionary doesn't exist when not being run inside a python
process (i.e. when embedded).
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -150,25 +150,29 @@ public static void Initialize() {
                 IntPtr clr = Python.Runtime.ImportHook.GetCLRModule();
                 IntPtr clr_dict = Runtime.PyModule_GetDict(clr);
 
-                IntPtr globals = Runtime.PyEval_GetGlobals();
                 PyDict locals = new PyDict();
                 try
                 {
+                    IntPtr module = Runtime.PyImport_AddModule("clr._extras");
+                    IntPtr module_globals = Runtime.PyModule_GetDict(module);
                     IntPtr builtins = Runtime.PyEval_GetBuiltins();
-                    Runtime.PyDict_SetItemString(locals.Handle, "__builtins__", builtins);
+                    Runtime.PyDict_SetItemString(module_globals, "__builtins__", builtins);
 
                     var assembly = Assembly.GetExecutingAssembly();
                     using (Stream stream = assembly.GetManifestResourceStream("Python.Runtime.resources.clr.py"))
                     using (StreamReader reader = new StreamReader(stream))
                     {
                         // add the contents of clr.py to the module
                         string clr_py = reader.ReadToEnd();
-                        PyObject result = RunString(clr_py, globals, locals.Handle);
+                        PyObject result = RunString(clr_py, module_globals, locals.Handle);
                         if (null == result)
                             throw new PythonException();
                         result.Dispose();
                     }
 
+                    // add the imported module to the clr module, and copy the API functions
+                    // and decorators into the main clr module.
+                    Runtime.PyDict_SetItemString(clr_dict, "_extras", module);
                     foreach (PyObject key in locals.Keys())
                     {
                         if (!key.ToString().StartsWith("_")){
