From a6d4b6e7fabc835c978d956e7fd38ef8ba1a03df Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Wed, 12 Dec 2012 11:06:15 -0500 Subject: [PATCH] BUG: Fix file separators for windows --- skimage/io/_io.py | 2 +- skimage/io/tests/test_io.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/skimage/io/_io.py b/skimage/io/_io.py index 2a177076..f8f395bd 100644 --- a/skimage/io/_io.py +++ b/skimage/io/_io.py @@ -16,7 +16,7 @@ from skimage.color import rgb2grey # Shared image queue _image_stack = [] -URL_REGEX = re.compile(r'http://|https://|ftp://|file://') +URL_REGEX = re.compile(r'http://|https://|ftp://|file://|file:\\') def is_url(filename): diff --git a/skimage/io/tests/test_io.py b/skimage/io/tests/test_io.py index b29994c5..aa48ac1a 100644 --- a/skimage/io/tests/test_io.py +++ b/skimage/io/tests/test_io.py @@ -1,3 +1,5 @@ +import os + from numpy.testing import * import numpy as np @@ -18,7 +20,7 @@ def test_stack_non_array(): def test_imread_url(): - image_url = 'file://%s/camera.png' % data_dir + image_url = 'file:{0}{0}{1}{0}camera.png'.format(os.path.sep, data_dir) image = io.imread(image_url) assert image.shape == (512, 512)