Cleaned try/except h5py blocks.

# Conflicts:
#	silx/io/test/test_fabioh5.py

Author: Alexandre Marie

examples/viewer3DVolume.py

@@ -52,13 +52,7 @@
 
 _logger = logging.getLogger(__name__)
 
-
-try:
-    import h5py
-except ImportError:
-    _logger.warning('h5py is not installed: HDF5 not supported')
-    h5py = None
-
+import h5py
 
 def load(filename):
     """Load 3D scalar field from file.
@@ -72,7 +66,7 @@ def load(filename):
     if not os.path.isfile(filename.split('::')[0]):
         raise IOError('No input file: %s' % filename)
 
-    if h5py is not None and h5py.is_hdf5(filename.split('::')[0]):
+    if h5py.is_hdf5(filename.split('::')[0]):
         if '::' not in filename:
             raise ValueError(
                 'HDF5 path not provided: Use <filename>::<path> format')

run_tests.py

@@ -115,7 +115,6 @@ def importer(name):
 else:
     logger.info("Numpy %s", numpy.version.version)
 
-
 try:
     import h5py
 except Exception as error:

silx/app/convert.py

@@ -307,20 +307,14 @@ def check_gzip_compression_opts(value):
         _logger.debug("Backtrace", exc_info=True)
         hdf5plugin = None
 
+    import h5py
+
     try:
-        import h5py
         from silx.io.convert import write_to_h5
     except ImportError:
         _logger.debug("Backtrace", exc_info=True)
-        h5py = None
         write_to_h5 = None
 
-    if h5py is None:
-        message = "Module 'h5py' is not installed but is mandatory."\
-            + " You can install it using \"pip install h5py\"."
-        _logger.error(message)
-        return -1
-
     if hdf5plugin is None:
         message = "Module 'hdf5plugin' is not installed. It supports additional hdf5"\
             + " compressions. You can install it using \"pip install hdf5plugin\"."

silx/app/test/test_convert.py

@@ -35,11 +35,7 @@
 import unittest
 import io
 import gc
-
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 import silx
 from .. import convert
@@ -103,14 +99,6 @@ def testHelp(self):
             result = e.args[0]
         self.assertEqual(result, 0)
 
-    @testutils.test_logging(convert._logger.name, error=1)
-    def testH5pyNotInstalled(self):
-        with testutils.EnsureImportError("h5py"):
-            result = convert.main(["convert", "foo.spec", "bar.edf"])
-            # we explicitly return -1 if h5py is not imported
-            self.assertNotEqual(result, 0)
-
-    @unittest.skipIf(h5py is None, "h5py is required to test convert")
     def testWrongOption(self):
         # presence of a wrong option must cause a SystemExit or a return
         # with a non-zero status
@@ -120,14 +108,12 @@ def testWrongOption(self):
             result = e.args[0]
         self.assertNotEqual(result, 0)
 
-    @unittest.skipIf(h5py is None, "h5py is required to test convert")
     @testutils.test_logging(convert._logger.name, error=3)
     # one error log per missing file + one "Aborted" error log
     def testWrongFiles(self):
         result = convert.main(["convert", "foo.spec", "bar.edf"])
         self.assertNotEqual(result, 0)
 
-    @unittest.skipIf(h5py is None, "h5py is required to test convert")
     def testFile(self):
         # create a writable temp directory
         tempdir = tempfile.mkdtemp()

silx/app/view/main.py

@@ -82,17 +82,7 @@ def mainQt(options):
     except ImportError:
         _logger.debug("Backtrace", exc_info=True)
 
-    try:
-        import h5py
-    except ImportError:
-        _logger.debug("Backtrace", exc_info=True)
-        h5py = None
-
-    if h5py is None:
-        message = "Module 'h5py' is not installed but is mandatory."\
-            + " You can install it using \"pip install h5py\"."
-        _logger.error(message)
-        return -1
+    import h5py
 
     app = qt.QApplication([])
     qt.QLocale.setDefault(qt.QLocale.c())

silx/app/view/test/test_view.py

@@ -35,10 +35,7 @@
 import tempfile
 import shutil
 import os.path
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 from silx.gui import qt
 from silx.app.view.Viewer import Viewer
@@ -56,22 +53,21 @@ def setUpModule():
     global _tmpDirectory
     _tmpDirectory = tempfile.mkdtemp(prefix=__name__)
 
-    if h5py is not None:
-        # create h5 data
-        filename = _tmpDirectory + "/data.h5"
-        f = h5py.File(filename, "w")
-        g = f.create_group("arrays")
-        g.create_dataset("scalar", data=10)
-        g.create_dataset("integers", data=numpy.array([10, 20, 30]))
-        f.close()
+    # create h5 data
+    filename = _tmpDirectory + "/data.h5"
+    f = h5py.File(filename, "w")
+    g = f.create_group("arrays")
+    g.create_dataset("scalar", data=10)
+    g.create_dataset("integers", data=numpy.array([10, 20, 30]))
+    f.close()
 
-        # create h5 data
-        filename = _tmpDirectory + "/data2.h5"
-        f = h5py.File(filename, "w")
-        g = f.create_group("arrays")
-        g.create_dataset("scalar", data=20)
-        g.create_dataset("integers", data=numpy.array([10, 20, 30]))
-        f.close()
+    # create h5 data
+    filename = _tmpDirectory + "/data2.h5"
+    f = h5py.File(filename, "w")
+    g = f.create_group("arrays")
+    g.create_dataset("scalar", data=20)
+    g.create_dataset("integers", data=numpy.array([10, 20, 30]))
+    f.close()
 
 
 def tearDownModule():
@@ -167,7 +163,6 @@ def testCustomDataItemNone(self):
         self.assertIs(widget.getData(), None)
         self.assertIs(widget.getCustomNxdataItem(), data)
 
-    @unittest.skipIf(h5py is None, "Could not import h5py")
     def testRemoveDatasetsFrom(self):
         f = h5py.File(os.path.join(_tmpDirectory, "data.h5"))
         try:
@@ -179,7 +174,6 @@ def testRemoveDatasetsFrom(self):
             widget.setData(None)
             f.close()
 
-    @unittest.skipIf(h5py is None, "Could not import h5py")
     def testReplaceDatasetsFrom(self):
         f = h5py.File(os.path.join(_tmpDirectory, "data.h5"))
         f2 = h5py.File(os.path.join(_tmpDirectory, "data2.h5"))
@@ -248,7 +242,6 @@ def testCreateBadNxdata(self):
         self.assertIsNotNone(nxdata)
         self.assertFalse(item.isValid())
 
-    @unittest.skipIf(h5py is None, "Could not import h5py")
     def testRemoveDatasetsFrom(self):
         f = h5py.File(os.path.join(_tmpDirectory, "data.h5"))
         try:
@@ -261,7 +254,6 @@ def testRemoveDatasetsFrom(self):
             model.clear()
             f.close()
 
-    @unittest.skipIf(h5py is None, "Could not import h5py")
     def testReplaceDatasetsFrom(self):
         f = h5py.File(os.path.join(_tmpDirectory, "data.h5"))
         f2 = h5py.File(os.path.join(_tmpDirectory, "data2.h5"))

silx/gui/data/Hdf5TableView.py

@@ -44,10 +44,7 @@
 from ..hdf5.Hdf5Formatter import Hdf5Formatter
 from ..hdf5._utils import htmlFromDict
 
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 
 _logger = logging.getLogger(__name__)
@@ -416,7 +413,7 @@ def __initProperties(self):
 
             self.__data.addHeaderRow(headerLabel="Data info")
 
-            if h5py is not None and hasattr(obj, "id") and hasattr(obj.id, "get_type"):
+            if hasattr(obj, "id") and hasattr(obj.id, "get_type"):
                 # display the HDF5 type
                 self.__data.addHeaderValueRow("HDF5 type", self.__formatHdf5Type)
             self.__data.addHeaderValueRow("dtype", self.__formatDType)

silx/gui/data/TextFormatter.py

@@ -37,10 +37,7 @@
 
 from silx.gui import qt
 
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 
 _logger = logging.getLogger(__name__)
@@ -324,10 +321,9 @@ def toString(self, data, dtype=None):
                 if dtype.kind == 'S':
                     return self.__formatCharString(data)
                 elif dtype.kind == 'O':
-                    if h5py is not None:
-                        text = self.__formatH5pyObject(data, dtype)
-                        if text is not None:
-                            return text
+                    text = self.__formatH5pyObject(data, dtype)
+                    if text is not None:
+                        return text
             try:
                 # Try ascii/utf-8
                 text = "%s" % data.decode("utf-8")
@@ -341,15 +337,14 @@ def toString(self, data, dtype=None):
         elif isinstance(data, (numpy.integer)):
             if dtype is None:
                 dtype = data.dtype
-            if h5py is not None:
-                enumType = h5py.check_dtype(enum=dtype)
-                if enumType is not None:
-                    for key, value in enumType.items():
-                        if value == data:
-                            result = {}
-                            result["name"] = key
-                            result["value"] = data
-                            return self.__enumFormat % result
+            enumType = h5py.check_dtype(enum=dtype)
+            if enumType is not None:
+                for key, value in enumType.items():
+                    if value == data:
+                        result = {}
+                        result["name"] = key
+                        result["value"] = data
+                        return self.__enumFormat % result
             return self.__integerFormat % data
         elif isinstance(data, (numbers.Integral)):
             return self.__integerFormat % data
@@ -375,21 +370,20 @@ def toString(self, data, dtype=None):
                     template = self.__floatFormat
                     params = (data.real)
             return template % params
-        elif h5py is not None and isinstance(data, h5py.h5r.Reference):
+        elif isinstance(data, h5py.h5r.Reference):
             dtype = h5py.special_dtype(ref=h5py.Reference)
             text = self.__formatH5pyObject(data, dtype)
             return text
-        elif h5py is not None and isinstance(data, h5py.h5r.RegionReference):
+        elif isinstance(data, h5py.h5r.RegionReference):
             dtype = h5py.special_dtype(ref=h5py.RegionReference)
             text = self.__formatH5pyObject(data, dtype)
             return text
         elif isinstance(data, numpy.object_) or dtype is not None:
             if dtype is None:
                 dtype = data.dtype
-            if h5py is not None:
-                text = self.__formatH5pyObject(data, dtype)
-                if text is not None:
-                    return text
+            text = self.__formatH5pyObject(data, dtype)
+            if text is not None:
+                return text
             # That's a numpy object
             return str(data)
         return str(data)

silx/gui/data/test/test_arraywidget.py

@@ -36,10 +36,7 @@
 from silx.gui.data import ArrayTableWidget
 from silx.gui.utils.testutils import TestCaseQt
 
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 
 class TestArrayWidget(TestCaseQt):
@@ -190,7 +187,6 @@ def testReferenceReturned(self):
         self.assertIs(b0, b1)
 
 
-@unittest.skipIf(h5py is None, "Could not import h5py")
 class TestH5pyArrayWidget(TestCaseQt):
     """Basic test for ArrayTableWidget with a dataset.
 

silx/gui/data/test/test_dataviewer.py

@@ -42,10 +42,7 @@
 from silx.gui.utils.testutils import SignalListener
 from silx.gui.utils.testutils import TestCaseQt
 
-try:
-    import h5py
-except ImportError:
-    h5py = None
+import h5py
 
 
 class _DataViewMock(DataView):
@@ -170,8 +167,6 @@ def test_record_4d_data(self):
         self.assertEqual(DataViews.RAW_MODE, widget.displayedView().modeId())
 
     def test_3d_h5_dataset(self):
-        if h5py is None:
-            self.skipTest("h5py library is not available")
         with self.h5_temporary_file() as h5file:
             dataset = h5file["data"]
             widget = self.create_widget()