TryToImport is more robust

tminka · tminka · commit fc47172fe7cb · 2021-01-04T00:17:14.000Z
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -228,10 +228,17 @@ public void SetPythonPath()
 
         string ListModules()
         {
-            var pkg_resources = Py.Import("pkg_resources");
-            var locals = new PyDict();
-            locals.SetItem("pkg_resources", pkg_resources);
-            return PythonEngine.Eval(@"sorted(['%s==%s' % (i.key, i.version) for i in pkg_resources.working_set])", null, locals.Handle).ToString();
+            try
+            {
+                var pkg_resources = Py.Import("pkg_resources");
+                var locals = new PyDict();
+                locals.SetItem("pkg_resources", pkg_resources);
+                return PythonEngine.Eval(@"sorted(['%s==%s' % (i.key, i.version) for i in pkg_resources.working_set])", null, locals.Handle).ToString();
+            }
+            catch (PythonException ex)
+            {
+                return ex.ToString();
+            }
         }
 
         void CheckImport(string moduleName)
@@ -240,12 +247,13 @@ void CheckImport(string moduleName)
 module_name = r'{moduleName}'
 import sys
 import importlib.util
-spec = importlib.util.find_spec(module_name)
-if spec is None:
-  raise ImportError('find_spec returned None')
-module = importlib.util.module_from_spec(spec)
-sys.modules[module_name] = module
-spec.loader.exec_module(module)
+if module_name not in sys.modules:
+    spec = importlib.util.find_spec(module_name)
+    if spec is None:
+        raise ImportError('find_spec returned None')
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[module_name] = module
+    spec.loader.exec_module(module)
 ");
         }
 
@@ -254,7 +262,7 @@ void TryToImport(IEnumerable<string> moduleNames, string message)
             List<Exception> exceptions = new List<Exception>();
             foreach (var moduleName in moduleNames)
             {
-                var exception = TryToImport(moduleName, " before setting PythonPath");
+                var exception = TryToImport(moduleName, message);
                 if (exception != null) exceptions.Add(exception);
             }
             if (exceptions.Count > 0)
@@ -280,9 +288,7 @@ Exception TryToImport(string moduleName, string message)
                     $" {folder} contains {string.Join(Path.PathSeparator.ToString(), Directory.EnumerateFileSystemEntries(folder).Select(fullName => Path.GetFileName(fullName)).ToArray())}" :
                     "").ToArray();
                 string folderContents = string.Join(" ", messages);
-                object[] meta_paths = Py.Import("sys").GetAttr("meta_path").As<object[]>();
-                string meta_path = string.Join(Path.PathSeparator.ToString(), meta_paths);
-                return new Exception($"Py.Import(\"{moduleName}\") failed {message}, sys.path={path}{folderContents} pkg_resources.working_set={ListModules()} sys.meta_path={meta_path}", ex);
+                return new Exception($"Py.Import(\"{moduleName}\") failed {message}, sys.path={path}{folderContents} pkg_resources.working_set={ListModules()}", ex);
             }
         }
     }
