# HG changeset patch
# User Olivier Delalleau <delallea@iro>
# Date 1313590739 14400
# Node ID 625fe86e3d5ece472e5f40321b06faf009948418
# Parent  0e6ca7eecc72b713e5a1b045212fd8db9dab2aad# Parent  b1af99fd7bf667878b496a8e2f22545bf16868dd
Merged

diff -r 0e6ca7eecc72 -r 625fe86e3d5e pylearn/datasets/config.py
--- a/pylearn/datasets/config.py	Wed Aug 17 10:18:39 2011 -0400
+++ b/pylearn/datasets/config.py	Wed Aug 17 10:18:59 2011 -0400
@@ -41,14 +41,16 @@
     if roots is None:
         roots = [data_root()]
     else:
-        roots = roots.split(':')
-    roots2 = []
-    #remove directory that don't exist
-    for root in roots:
-        if os.path.exists(root):
-            roots2.append(root)
-    data_roots.rval = roots2
-    return roots2
+        # Note that under Windows, we cannot use ':' as a delimiter because
+        # paths may contain this character. Thus we use ';' instead (similar to
+        # the PATH environment variable in Windows).
+        if sys.platform == 'win32':
+            roots = roots.split(';')
+        else:
+            roots = roots.split(':')
+    # Remove paths that are not directories.
+    data_roots.rval = [r for r in roots if os.path.isdir(r)]
+    return data_roots.rval
 
 
 def get_filepath_in_roots(*names):