type cleanups

Author: mr-c

cwltool/load_tool.py

@@ -9,7 +9,8 @@
 import hashlib
 import json
 import copy
-from typing import Any, Callable, Dict, List, Text, Tuple, Union, cast, Iterable
+from typing import (Any, Callable, Dict, Iterable, List, Mapping, Optional,
+        Text, Tuple, Union, cast)
 
 import requests.sessions
 from six import itervalues, string_types
@@ -18,7 +19,7 @@
 import schema_salad.schema as schema
 from avro.schema import Names
 from ruamel.yaml.comments import CommentedMap, CommentedSeq
-from schema_salad.ref_resolver import Fetcher, Loader, file_uri
+from schema_salad.ref_resolver import ContextType, Fetcher, Loader, file_uri
 from schema_salad.sourceline import cmap
 from schema_salad.validate import ValidationException
 
@@ -28,15 +29,14 @@
 from .update import ALLUPDATES
 
 _logger = logging.getLogger("cwltool")
-
 jobloaderctx = {
     u"cwl": "https://w3id.org/cwl/cwl#",
     u"cwltool": "http://commonwl.org/cwltool#",
     u"path": {u"@type": u"@id"},
     u"location": {u"@type": u"@id"},
     u"format": {u"@type": u"@id"},
     u"id": u"@id"
-}
+}  # type: ContextType
 
 
 overrides_ctx = {
@@ -51,12 +51,16 @@
         "@id": "cwltool:override",
         "mapSubject": "class"
     }
-}  # type: Dict[Text, Union[Dict[Any, Any], Text, Iterable[Text]]]
+}  # type: ContextType
+
 
+FetcherConstructorType = Callable[[Dict[Text, Union[Text, bool]],
+    requests.sessions.Session], Fetcher]
 
-loaders = {}
+loaders = {}  # type: Dict[FetcherConstructorType, Loader]
 
 def default_loader(fetcher_constructor):
+    # type: (Optional[FetcherConstructorType]) -> Loader
     if fetcher_constructor in loaders:
         return loaders[fetcher_constructor]
     else:
@@ -66,7 +70,7 @@ def default_loader(fetcher_constructor):
 
 def resolve_tool_uri(argsworkflow,  # type: Text
                      resolver=None,  # type: Callable[[Loader, Union[Text, Dict[Text, Any]]], Text]
-                     fetcher_constructor=None,  # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
+                     fetcher_constructor=None,  # type: FetcherConstructorType
                      document_loader=None  # type: Loader
                      ):  # type: (...) -> Tuple[Text, Text]
 
@@ -94,7 +98,7 @@ def resolve_tool_uri(argsworkflow,  # type: Text
 
 def fetch_document(argsworkflow,  # type: Union[Text, Dict[Text, Any]]
                    resolver=None,  # type: Callable[[Loader, Union[Text, Dict[Text, Any]]], Text]
-                   fetcher_constructor=None  # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
+                   fetcher_constructor=None  # type: FetcherConstructorType
                   ):  # type: (...) -> Tuple[Loader, CommentedMap, Text]
     """Retrieve a CWL document."""
 
@@ -178,7 +182,7 @@ def validate_document(document_loader,  # type: Loader
                       enable_dev=False,  # type: bool
                       strict=True,  # type: bool
                       preprocess_only=False,  # type: bool
-                      fetcher_constructor=None,  # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
+                      fetcher_constructor=None,  # type: FetcherConstructorType
                       skip_schemas=None,  # type: bool
                       overrides=None,  # type: List[Dict]
                       metadata=None,  # type: Optional[Dict]
@@ -333,7 +337,7 @@ def load_tool(argsworkflow,  # type: Union[Text, Dict[Text, Any]]
               enable_dev=False,  # type: bool
               strict=True,  # type: bool
               resolver=None,  # type: Callable[[Loader, Union[Text, Dict[Text, Any]]], Text]
-              fetcher_constructor=None,  # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
+              fetcher_constructor=None,  # type: FetcherConstructorType
               overrides=None
               ):
     # type: (...) -> Process

cwltool/main.py

@@ -27,8 +27,9 @@
 from .builder import Builder
 from .cwlrdf import printdot, printrdf
 from .errors import UnsupportedRequirement, WorkflowException
-from .load_tool import (resolve_tool_uri, fetch_document, make_tool, validate_document,
-                        jobloaderctx, resolve_overrides, load_overrides)
+from .load_tool import (FetcherConstructorType, resolve_tool_uri,
+        fetch_document, make_tool, validate_document, jobloaderctx,
+        resolve_overrides, load_overrides)
 from .mutation import MutationManager
 from .pack import pack
 from .pathmapper import (adjustDirObjs, adjustFileObjs, get_listing,
@@ -735,7 +736,7 @@ def main(argsl=None,  # type: List[str]
          versionfunc=versionstring,  # type: Callable[[], Text]
          job_order_object=None,  # type: MutableMapping[Text, Any]
          make_fs_access=StdFsAccess,  # type: Callable[[Text], StdFsAccess]
-         fetcher_constructor=None,  # type: Callable[[Dict[Text, Text], requests.sessions.Session], Fetcher]
+         fetcher_constructor=None,  # type: FetcherConstructorType
          resolver=tool_resolver,
          logger_handler=None,
          custom_schema_callback=None  # type: Callable[[], None]