From 561df711c00edc8f50f7a1b173f8f110aeb100eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Kieffer?= Date: Fri, 12 Mar 2021 14:04:15 +0100 Subject: [PATCH] close #441 and prevent regression with a test ! --- fabio/fabioimage.py | 4 ++-- fabio/test/codecs/test_hdf5image.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fabio/fabioimage.py b/fabio/fabioimage.py index cca162642..2adb31c66 100644 --- a/fabio/fabioimage.py +++ b/fabio/fabioimage.py @@ -42,7 +42,7 @@ __contact__ = "jerome.kieffer@esrf.fr" __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 index a628cabbc..0ee31a745 100644 --- 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