URI / Path conversion enhanced

should work with win32 now

Author: psafont

cwltool/load_tool.py

@@ -6,12 +6,17 @@
 import logging
 import re
 import urlparse
+try:
+    import pathlib
+except:
+    import pathlib2 as pathlib
 
 from typing import Any, AnyStr, Callable, cast, Dict, Text, Tuple, Union
 from ruamel.yaml.comments import CommentedSeq, CommentedMap
 from avro.schema import Names
 import requests.sessions
 
+
 from schema_salad.ref_resolver import Loader, Fetcher
 import schema_salad.validate as validate
 from schema_salad.validate import ValidationException
@@ -42,7 +47,7 @@ def fetch_document(argsworkflow,   # type: Union[Text, dict[Text, Any]]
         if split.scheme:
             uri = argsworkflow
         elif os.path.exists(os.path.abspath(argsworkflow)):
-            uri = "file://" + os.path.abspath(argsworkflow)
+            uri = pathlib.Path(os.path.abspath(argsworkflow)).as_uri()
         elif resolver:
             uri = resolver(document_loader, argsworkflow)
 

cwltool/pathmapper.py

@@ -3,6 +3,7 @@
 import stat
 import collections
 import uuid
+import urllib
 import urlparse
 from functools import partial
 from typing import Any, Callable, Set, Text, Tuple, Union
@@ -72,7 +73,7 @@ def addLocation(d):
 
 def abspath(src, basedir):  # type: (Text, Text) -> Text
     if src.startswith(u"file://"):
-        ab = src[7:]
+        ab = urllib.url2pathname(urlparse.urlparse(src).path)
     else:
         ab = src if os.path.isabs(src) else os.path.join(basedir, src)
     return ab

requirements.txt

@@ -6,3 +6,4 @@ shellescape==3.4.1
 schema-salad>=2.1.20161216210732,<3
 cwltest>=1.0.20160907111242
 typing==3.5.2.2 ; python_version>="2.7"
+pathlib2==2.1.0 ; python_version<"3.4"