renamed pathFix to convert_pathsep_to_unix and moved it to utils

Author: kapilkd13

cwltool/draft2tool.py

@@ -28,7 +28,7 @@
                       _logger_validation_warnings, compute_checksums,
                       normalizeFilesDirs, shortname, uniquename)
 from .stdfsaccess import StdFsAccess
-from .utils import aslist, docker_windows_path_adjust, onWindows
+from .utils import aslist, docker_windows_path_adjust, convert_pathsep_to_unix
 from six.moves import map
 
 ACCEPTLIST_EN_STRICT_RE = re.compile(r"^[a-zA-Z0-9._+-]+$")
@@ -107,7 +107,7 @@ def revmap_file(builder, outdir, f):
 
     if "location" in f:
         if f["location"].startswith("file://"):
-            path = pathFix(uri_file_path(f["location"]))
+            path = convert_pathsep_to_unix(uri_file_path(f["location"]))
             revmap_f = builder.pathmapper.reversemap(path)
             if revmap_f:
                 f["location"] = revmap_f[1]
@@ -133,12 +133,6 @@ def revmap_file(builder, outdir, f):
 
     raise WorkflowException(u"Output File object is missing both `location` and `path` fields: %s" % f)
 
-# On windows os.path.join would use backslash to join path, since we would use these paths in Docker we would convert it to /
-def pathFix(path):  # type: (Text) -> (Text)
-    if path is not None and onWindows():
-        return path.replace('\\', '/')
-    return path
-
 
 class CallbackJob(object):
     def __init__(self, job, output_callback, cachebuilder, jobcache):

cwltool/pathmapper.py

@@ -12,7 +12,7 @@
 from schema_salad.sourceline import SourceLine
 from six.moves import urllib
 
-from .utils import onWindows
+from .utils import convert_pathsep_to_unix
 
 from .stdfsaccess import StdFsAccess, abspath
 
@@ -188,7 +188,8 @@ def visitlisting(self, listing, stagedir, basedir, copy=False, staged=False):
 
     def visit(self, obj, stagedir, basedir, copy=False, staged=False):
         # type: (Dict[Text, Any], Text, Text, bool, bool) -> None
-        tgt = self.pathFix(os.path.join(stagedir, obj["basename"]))
+        tgt = convert_pathsep_to_unix(
+            os.path.join(stagedir, obj["basename"]))
         if obj["location"] in self._pathmap:
             return
         if obj["class"] == "Directory":
@@ -249,8 +250,3 @@ def reversemap(self, target):  # type: (Text) -> Tuple[Text, Text]
                 return (k, v[0])
         return None
 
-    # On windows os.path.join would use backslash to join path, since we would use these paths in Docker we would convert it to /
-    def pathFix(self,path):  # type: (Text) -> (Text)
-        if path is not None and onWindows():
-            return path.replace('\\','/')
-        return path

cwltool/utils.py

@@ -111,6 +111,13 @@ def onWindows():
     return os.name == 'nt'
 
 
+
+# On windows os.path.join would use backslash to join path, since we would use these paths in Docker we would convert it to /
+def convert_pathsep_to_unix(path):  # type: (Text) -> (Text)
+    if path is not None and onWindows():
+        return path.replace('\\', '/')
+    return path
+
 # comparision function to be used in sorting
 # python3 doesn't allow sorting of different
 # types like str() and int().