misc type improvements for mypy3

Author: manu-chroma

cwltool/job.py

@@ -460,6 +460,7 @@ def _job_popen(
             job_script_contents = SHELL_COMMAND_TEMPLATE
 
         env_copy = {}
+        key = None  # type: Union[Text, bytes]
         for key in env:
             key = key.encode("utf-8")
             env_copy[key] = env[key]

cwltool/load_tool.py

@@ -137,7 +137,7 @@ def validate_document(document_loader,  # type: Loader
                       preprocess_only=False,  # type: bool
                       fetcher_constructor=None,
                       skip_schemas=None
-                      # type: Callable[[Dict[unicode, unicode], requests.sessions.Session], Fetcher]
+                      # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
                       ):
     # type: (...) -> Tuple[Loader, Names, Union[Dict[Text, Any], List[Dict[Text, Any]]], Dict[Text, Any], Text]
     """Validate a CWL document."""

cwltool/pack.py

@@ -28,7 +28,7 @@ def find_run(d, loadref, runs):  # type: (Any, Callable[[Text, Text], Union[Dict
         for s in d:
             find_run(s, loadref, runs)
     elif isinstance(d, dict):
-        if "run" in d and isinstance(d["run"], six.string_types)):
+        if "run" in d and isinstance(d["run"], six.string_types):
             if d["run"] not in runs:
                 runs.add(d["run"])
                 find_run(loadref(None, d["run"]), loadref, runs)
@@ -42,7 +42,7 @@ def find_ids(d, ids):  # type: (Any, Set[Text]) -> None
             find_ids(s, ids)
     elif isinstance(d, dict):
         for i in ("id", "name"):
-            if i in d and isinstance(d[i], six.string_types)):
+            if i in d and isinstance(d[i], six.string_types):
                 ids.add(d[i])
         for s in d.values():
             find_ids(s, ids)