Merge branch 'develop'

metacall · May 19, 2021 · a72d15c · a72d15c
2 parents 9ec4bc1 + ec4607d
commit a72d15c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/source/loaders/py_loader/source/py_loader_impl.c b/source/loaders/py_loader/source/py_loader_impl.c
@@ -1565,7 +1565,11 @@ int py_loader_impl_initialize_import(loader_impl_py py_impl)
 		"			m = importlib.util.module_from_spec(spec)\n"
 		"			spec.loader.exec_module(m)\n"
 		"			return m\n"
+		"	except ImportError as e:\n"
+		"		return e\n"
 		"	except Exception as e:\n"
+		"		import traceback\n"
+		"		print(traceback.format_exc())\n"
 		"		return e\n"
 #elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3
 		// TODO: Not tested

diff --git a/source/scripts/ruby/blog/source/Gemfile.lock b/source/scripts/ruby/blog/source/Gemfile.lock
@@ -74,10 +74,10 @@ GEM
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
     mini_mime (1.0.2)
-    mini_portile2 (2.5.0)
+    mini_portile2 (2.5.1)
     minitest (5.11.3)
     nio4r (2.5.7)
-    nokogiri (1.11.1)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     puma (4.3.8)