Set _num_frames based on load_func instead of load_pattern

maaleske · maaleske · commit 5899e761e168 · 2017-09-28T16:03:00.000+03:00
diff --git a/skimage/io/collection.py b/skimage/io/collection.py
@@ -162,12 +162,20 @@ def __init__(self, load_pattern, conserve_memory=True, load_func=None,
             for pattern in load_pattern:
                 self._files.extend(glob(pattern))
             self._files = sorted(self._files, key=alphanumeric_key)
-            self._numframes = self._find_images()
         else:
             self._files = load_pattern
+
+        if load_func is None:
+            from ._io import imread
+            self.load_func = imread
+            self._numframes = self._find_images()
+        else:
+            self.load_func = load_func
             self._numframes = len(self._files)
             self._frame_index = None
 
+        self.load_func_kwargs = load_func_kwargs
+
         if conserve_memory:
             memory_slots = 1
         else:
@@ -176,14 +184,6 @@ def __init__(self, load_pattern, conserve_memory=True, load_func=None,
         self._conserve_memory = conserve_memory
         self._cached = None
 
-        if load_func is None:
-            from ._io import imread
-            self.load_func = imread
-        else:
-            self.load_func = load_func
-
-        self.load_func_kwargs = load_func_kwargs
-
         self.data = np.empty(memory_slots, dtype=object)
 
     @property
