Skip to content

Commit a72d15c

Browse files
committed
Merge branch 'develop'
2 parents 9ec4bc1 + ec4607d commit a72d15c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

source/loaders/py_loader/source/py_loader_impl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1565,7 +1565,11 @@ int py_loader_impl_initialize_import(loader_impl_py py_impl)
15651565
" m = importlib.util.module_from_spec(spec)\n"
15661566
" spec.loader.exec_module(m)\n"
15671567
" return m\n"
1568+
" except ImportError as e:\n"
1569+
" return e\n"
15681570
" except Exception as e:\n"
1571+
" import traceback\n"
1572+
" print(traceback.format_exc())\n"
15691573
" return e\n"
15701574
#elif PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 3
15711575
// TODO: Not tested

source/scripts/ruby/blog/source/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ GEM
7474
mini_mime (>= 0.1.1)
7575
method_source (0.9.2)
7676
mini_mime (1.0.2)
77-
mini_portile2 (2.5.0)
77+
mini_portile2 (2.5.1)
7878
minitest (5.11.3)
7979
nio4r (2.5.7)
80-
nokogiri (1.11.1)
80+
nokogiri (1.11.4)
8181
mini_portile2 (~> 2.5.0)
8282
racc (~> 1.4)
8383
puma (4.3.8)

0 commit comments

Comments
 (0)