Merge pull request #1190 from vasole/simple

lazy import of multiprocessing

Author: vasole

src/PyMca5/PyMcaGui/physics/xrf/ElementsInfo.py

@@ -32,14 +32,6 @@
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 import sys
 import logging
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 from PyMca5.PyMcaGui import PyMcaQt as qt
 from PyMca5.PyMcaPhysics.xrf import ElementHtml
 from PyMca5.PyMcaPhysics.xrf import Elements

src/PyMca5/PyMcaGui/physics/xrf/PeakIdentifier.py

@@ -32,14 +32,6 @@
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 import sys
 import logging
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 from PyMca5.PyMcaGui import PyMcaQt as qt
 from PyMca5.PyMcaPhysics import Elements
 from PyMca5.PyMcaGui.plotting import PyMca_Icons

src/PyMca5/PyMcaGui/pymca/EdfFileSimpleViewer.py

@@ -30,14 +30,6 @@
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 import sys
 import logging
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 from PyMca5.PyMcaGui import PyMcaQt as qt
 
 QTVERSION = qt.qVersion()

src/PyMca5/PyMcaGui/pymca/Mca2Edf.py

@@ -32,15 +32,6 @@
 import os
 import numpy
 import time
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
-
 from PyMca5.PyMcaGui import PyMcaQt as qt
 QTVERSION = qt.qVersion()
 if QTVERSION >= '4.0.0':

src/PyMca5/PyMcaGui/pymca/PyMcaBatch.py

@@ -36,14 +36,6 @@
 import atexit
 import logging
 import traceback
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 from glob import glob
 from contextlib import contextmanager
 try:

src/PyMca5/PyMcaGui/pymca/PyMcaMain.py

@@ -32,14 +32,6 @@
 import sys, getopt
 import traceback
 import logging
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 if sys.platform == 'win32':
     import ctypes
     from ctypes.wintypes import MAX_PATH

src/PyMca5/PyMcaGui/pymca/PyMcaPostBatch.py

@@ -31,14 +31,6 @@
 import sys
 import os
 import logging
-if __name__== '__main__':
-    # this is to avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 _logger = logging.getLogger(__name__)
 if __name__ == "__main__":    
     # We are going to read. Disable file locking.

src/PyMca5/PyMcaGui/pymca/QStackWidget.py

@@ -35,14 +35,6 @@
 import numpy
 import weakref
 import logging
-if __name__== '__main__':
-    # avoid issues if some module or dependency tries to use multiprocessing in frozen binaries
-    if getattr(sys, "frozen", False):
-        try:
-            import multiprocessing
-            multiprocessing.freeze_support()
-        except Exception:
-            pass
 _logger = logging.getLogger(__name__)
 
 if __name__ == "__main__":

src/PyMca5/PyMcaIO/HDF5Utils.py

@@ -5,12 +5,6 @@
 import posixpath
 from queue import Empty
 _logger = logging.getLogger(__name__)
-try:
-    import multiprocessing
-    _MULTIPROCESS = True
-except Exception:
-    _logger.info("multiprocessing not available")
-    _MULTIPROCESS = False
 from operator import itemgetter
 
 
@@ -27,16 +21,17 @@ def get_hdf5_group_keys(file_path, data_path=None):
 
 
 def safe_hdf5_group_keys(file_path, data_path=None):
-    if _MULTIPROCESS:
+    try:
         return run_in_subprocess(
             get_hdf5_group_keys, file_path, data_path=data_path, default=list()
         )
-    else:
-        _logger.warning("multiprocessing not available")
+    except Exception:
+        _logger.warning("run_in_subprocess not available")
         return get_hdf5_group_keys(file_path, data_path)
 
 
 def run_in_subprocess(target, *args, context=None, default=None, **kwargs):
+    import multiprocessing
     ctx = multiprocessing.get_context(context)
     queue = ctx.Queue(maxsize=1)
     p = ctx.Process(

src/PyMca5/tests/HDF5UtilsTest.py

@@ -6,6 +6,10 @@
 import datetime
 import h5py
 import sys
+try:
+    import multiprocessing
+except Exception:
+    pass
 
 from PyMca5.PyMcaIO import HDF5Utils
 
@@ -43,6 +47,7 @@ def testHdf5GroupKeys(self):
         self.assertEqual(HDF5Utils.get_hdf5_group_keys(filename), names)
         self.assertEqual(HDF5Utils.safe_hdf5_group_keys(filename), names)
 
+    @unittest.skipIf("multiprocessing" not in sys.modules, "skipped multiprocessing missing")
     def testSegFault(self):
         self.assertEqual(_safe_cause_segfault(default=123), 123)