From 5403e7a61e7b390a4dd09c8db6107357c85302c8 Mon Sep 17 00:00:00 2001 From: cgohlke Date: Mon, 10 Mar 2014 22:50:00 -0700 Subject: [PATCH] Use os.pathsep to sepatate multiple ImageCollection load_pattern The colon `:` does not work on Windows as it can be part of a path --- skimage/io/collection.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/skimage/io/collection.py b/skimage/io/collection.py index 96d29d4a..83811fc0 100644 --- a/skimage/io/collection.py +++ b/skimage/io/collection.py @@ -2,6 +2,7 @@ from __future__ import with_statement +import os from glob import glob import re from copy import copy @@ -229,7 +230,7 @@ class ImageCollection(object): ---------- load_pattern : str or list Pattern glob or filenames to load. The path can be absolute or - relative. Multiple patterns should be separated by a colon, + relative. Multiple patterns should be separated by os.pathsep, e.g. '/tmp/work/*.png:/tmp/other/*.jpg'. Also see implementation notes below. conserve_memory : bool, optional @@ -295,7 +296,7 @@ class ImageCollection(object): def __init__(self, load_pattern, conserve_memory=True, load_func=None): """Load and manage a collection of images.""" if isinstance(load_pattern, six.string_types): - load_pattern = load_pattern.split(':') + load_pattern = load_pattern.split(os.pathsep) self._files = [] for pattern in load_pattern: self._files.extend(glob(pattern))