type fixes

Author: mr-c

cwltool/expression.py

@@ -223,7 +223,8 @@ def interpolate(scan, rootvars,
     return ''.join(parts)
 
 def needs_parsing(snippet):  # type: (Any) -> bool
-    return isinstance(snippet, (Text)) and ("$(" in snippet or "${" in snippet)
+    return isinstance(snippet, (str, Text)) \
+        and ("$(" in snippet or "${" in snippet)
 
 def do_eval(ex, jobinput, requirements, outdir, tmpdir, resources,
             context=None, pull_image=True, timeout=None, force_docker_pull=False,
@@ -240,6 +241,7 @@ def do_eval(ex, jobinput, requirements, outdir, tmpdir, resources,
         u"runtime": runtime}
 
     if needs_parsing(ex):
+        assert isinstance(ex, (str, Text))
         fullJS = False
         jslib = u""
         for r in reversed(requirements):

cwltool/process.py

@@ -417,7 +417,7 @@ def var_spool_cwl_detector(obj,           # type: Union[Dict, List, Text]
             r = var_spool_cwl_detector(value, obj, key) or r
     return r
 
-def eval_resource(builder, resource_req):
+def eval_resource(builder, resource_req):  # type: (Builder, Text) -> Any
         if expression.needs_parsing(resource_req):
             visit_class(builder.job, ("File",), add_sizes)
             return builder.do_eval(resource_req)