drop some unused imports, still have circular dependencies

Author: mr-c

cwltool/draft2tool.py

@@ -7,17 +7,12 @@
 from .pathmapper import PathMapper, DockerPathMapper
 from .job import CommandLineJob
 import yaml
-import glob
 import logging
 import hashlib
-import random
 from .process import Process, shortname, uniquename, adjustFileObjs
 from .errors import WorkflowException
 import schema_salad.validate as validate
 from .aslist import aslist
-from . import expression
-import re
-import urlparse
 import tempfile
 from .builder import CONTENT_LIMIT, substitute, Builder
 import shellescape
@@ -238,7 +233,7 @@ def _check_adjust(f):
             for b in builder.bindings:
                 arg = builder.generate_arg(b)
                 if b.get("shellQuote", True):
-                    arg = [shellescape.quote(a) for a in aslist(arg)]
+                    arg = [shellescape.quote(c) for c in aslist(arg)]
                 cmd.extend(aslist(arg))
             j.command_line = ["/bin/sh", "-c", " ".join(cmd)]
         else:

cwltool/process.py

@@ -407,6 +407,7 @@ def uniquename(stem):
     _names.add(u)
     return u
 
+
 def scandeps(base, doc, reffields, urlfields):
     r = []
     if isinstance(doc, dict):

cwltool/workflow.py

@@ -184,11 +184,11 @@ def __init__(self, workflow, **kwargs):
             self.outdir = tempfile.mkdtemp()
 
         self.name = uniquename(
-                "workflow %s" % kwargs.get(
-                    "name", shortname(self.workflow.tool["id"])))
+            "workflow %s" % kwargs.get(
+                "name", shortname(self.workflow.tool["id"])))
 
         _logger.debug(
-                "[%s] initialized step from %s", self.name, self.tool["id"])
+            "[%s] initialized step from %s", self.name, self.tool["id"])
 
     def receive_output(self, step, outputparms, jobout, processStatus):
         for i in outputparms:
@@ -207,10 +207,10 @@ def receive_output(self, step, outputparms, jobout, processStatus):
                 self.processStatus = processStatus
 
             _logger.warn(
-                    "[%s] completion status is %s", step.name, processStatus)
+                "[%s] completion status is %s", step.name, processStatus)
         else:
             _logger.info(
-                    "[%s] completion status is %s", step.name, processStatus)
+                "[%s] completion status is %s", step.name, processStatus)
 
         step.completed = True
 
@@ -276,12 +276,13 @@ def valueFromFunc(k, v):
                         **kwargs)
             else:
                 _logger.debug(
-                        "[job %s] job input %s", step.name,
-                        json.dumps(inputobj, indent=4))
-                inputobj = {k: valueFromFunc(k, v) for k,v in inputobj.items()}
+                    "[job %s] job input %s", step.name,
+                    json.dumps(inputobj, indent=4))
+                inputobj = {k: valueFromFunc(k, v)
+                            for k, v in inputobj.items()}
                 _logger.debug(
-                        "[job %s] evaluated job input to %s", step.name,
-                        json.dumps(inputobj, indent=4))
+                    "[job %s] evaluated job input to %s", step.name,
+                    json.dumps(inputobj, indent=4))
                 jobs = step.job(inputobj, basedir, callback, **kwargs)
 
             step.submitted = True
@@ -387,8 +388,7 @@ def job(self, joborder, basedir, output_callback, move_outputs=True,
                         if not os.path.exists(dirname):
                             os.makedirs(dirname)
                         _logger.debug(
-                                "[%s] Moving '%s' to '%s'",
-                                self.name, src, dst)
+                            "[%s] Moving '%s' to '%s'", self.name, src, dst)
                         shutil.move(src, dst)
                         f["path"] = dst
 
@@ -398,8 +398,6 @@ def job(self, joborder, basedir, output_callback, move_outputs=True,
                         _logger.debug(
                             "[%s] Removing intermediate output "
                             "directory %s", self.name, a)
-                            "[workflow %s] Removing intermediate output "
-                            "directory %s", self.name, a)
                         shutil.rmtree(a, True)
 
         _logger.info("[%s] outdir is %s", self.name, self.outdir)