Skip to content

Commit e241eb2

Browse files
Merge pull request #1209 from silx-kit/hdf5_lock
Locking before import h5py
2 parents a1703ae + d6038db commit e241eb2

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/PyMca5/PyMcaGui/PyMcaAppInit.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def main(args):
7373
_logger = logging.getLogger(__name__)
7474

7575

76-
def init_before_app_import(qt=True, mp=True, mpl=True, logging=True):
76+
def init_before_app_import(qt=True, mp=True, mpl=True, logging=True, hdf5=True):
7777
"""
7878
Call this before importing application dependencies.
7979
"""
@@ -85,19 +85,20 @@ def init_before_app_import(qt=True, mp=True, mpl=True, logging=True):
8585
if logging:
8686
_init_logging_from_cli(cli_args)
8787

88+
if hdf5:
89+
_init_hdf5()
90+
8891
if qt:
8992
_init_qt_binding_from_cli(cli_args)
9093

9194
if mpl:
9295
_init_matplotlib()
9396

9497

95-
def init_before_app_create(qt=True, hdf5=True):
98+
def init_before_app_create(qt=True):
9699
"""
97100
Call this after importing application dependencies and before instantiating the application.
98101
"""
99-
if hdf5:
100-
_init_hdf5()
101102

102103
if qt:
103104
_init_qt_before()

0 commit comments

Comments
 (0)