Merge pull request #442 from kif/441_hdf5

close #441
silx-kit · Mar 15, 2021 · af2e3db · af2e3db
2 parents 89120ad + 561df71
commit af2e3db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/fabio/fabioimage.py b/fabio/fabioimage.py
@@ -42,7 +42,7 @@
 __contact__ = "[email protected]"
 __license__ = "MIT"
 __copyright__ = "ESRF"
-__date__ = "11/12/2020"
+__date__ = "12/03/2021"
 
 import os
 import logging
@@ -863,7 +863,7 @@ def __iter__(self):
             yield current_image
             try:
                 current_image = current_image.next()
-            except IOError:
+            except (IOError, IndexError):
                 break
 
 

diff --git a/fabio/test/codecs/test_hdf5image.py b/fabio/test/codecs/test_hdf5image.py
@@ -115,6 +115,11 @@ def test_next_frames(self):
         self.assertEqual(frame_nb, 50)
         self.assertEqual(frame_id, 49)
 
+    def test_iterate(self):
+        for i, f in enumerate(openimage(self.fn3)):
+            print(i, f)
+        self.assertEqual(i, 49, "Last frame is #49")
+
 
 def suite():
     loadTests = unittest.defaultTestLoader.loadTestsFromTestCase