more typing

Author: fredrikt

src/pyff/pipes.py

@@ -7,7 +7,7 @@
 import functools
 import os
 import traceback
-from typing import Any, Callable, Dict, Iterable, List, Optional
+from typing import Any, Callable, Dict, Iterable, Optional
 from typing import Type
 
 import yaml

src/pyff/repo.py

@@ -2,7 +2,7 @@
 
 from .constants import config
 from .logs import get_log
-from .resource import IconHandler, Resource, ResourceOpts
+from .resource import Resource, ResourceOpts
 from .samlmd import entitiesdescriptor, root
 from .store import make_icon_store_instance, make_store_instance
 from .utils import is_text, make_default_scheduler
@@ -52,7 +52,7 @@ def lookup(self, member, xp=None, store=None):
         :param xp: An optional xpath filter
         :type xp: basestring
         :param store: the store to operate on
-        :return: An interable of EntityDescriptor elements
+        :return: An iterable of EntityDescriptor elements
         :rtype: etree.Element
 
 
@@ -66,7 +66,7 @@ def lookup(self, member, xp=None, store=None):
 
         The first form results in the intersection of the results of doing a lookup on the selectors. The second form
         results in the EntityDescriptor elements from the source (defaults to all EntityDescriptors) that match the
-        xpath expression. The attribute-value forms resuls in the EntityDescriptors that contain the specified entity
+        xpath expression. The attribute-value forms results in the EntityDescriptors that contain the specified entity
         attribute pair. If non of these forms apply, the lookup is done using either source ID (normally @Name from
         the EntitiesDescriptor) or the entityID of single EntityDescriptors. If member is a URI but isn't part of
         the metadata repository then it is fetched an treated as a list of (one per line) of selectors. If all else

src/pyff/resource.py

@@ -10,7 +10,7 @@
 from collections import deque
 from datetime import datetime
 from threading import Condition, Lock
-from typing import Any, Callable, Deque, Dict, List, Optional, TYPE_CHECKING, Tuple, Union
+from typing import Any, Callable, Deque, Dict, Iterable, List, Optional, TYPE_CHECKING, Tuple, Union
 from urllib.parse import quote as urlescape
 
 import requests
@@ -22,11 +22,22 @@
 from .exceptions import ResourceException
 from .fetch import make_fetcher
 from .logs import get_log
-from .utils import Watchable, hex_digest, img_to_data, non_blocking_lock, resource_string, safe_write, url_get, utc_now
+
+from .utils import (
+    Watchable,
+    hex_digest,
+    img_to_data,
+    non_blocking_lock,
+    resource_string,
+    safe_write,
+    url_get,
+    utc_now,
+)
 
 if TYPE_CHECKING:
     from .parse import PyffParser
     from .pipes import PipelineCallback
+    from .utils import Lambda
 
 requests.packages.urllib3.disable_warnings()
 
@@ -140,15 +151,20 @@ class ResourceOpts(BaseModel):
     alias: Optional[str] = Field(None, alias='as')  # TODO: Rename to 'name'?
     # a certificate (file) or a SHA1 fingerprint to use for signature verification
     verify: Optional[str] = None
-    via: List[Any] = Field([])  # list of PipelineCallback
-    # A list of PipelineCallback that can be used to pre-process parsed metadata before validation. Use as a clue-bat.
-    cleanup: List[Any] = Field([])  # list of PipelineCallback
+    # TODO: move classes to make the correct typing work: Iterable[Union[Lambda, PipelineCallback]] = Field([])
+    via: List[Callable] = Field([])
+    # A list of callbacks that can be used to pre-process parsed metadata before validation. Use as a clue-bat.
+    # TODO: sort imports to make the correct typing work: Iterable[PipelineCallback] = Field([])
+    cleanup: List[Callable] = Field([])
     fail_on_error: bool = False
     # remove invalid EntityDescriptor elements rather than raise an error
     filter_invalid: bool = True
     # set to False to turn off all XML schema validation
     validate_schema: bool = Field(True, alias='validate')
 
+    class Config:
+        arbitrary_types_allowed = True
+
     def to_dict(self) -> Dict[str, Any]:
         res = self.dict()
         # Compensate for the 'alias' field options
@@ -198,14 +214,17 @@ def local_copy_fn(self):
         return os.path.join(config.local_copy_dir, urlescape(self.url))
 
     @property
-    def post(self) -> List['PipelineCallback']:
+    def post(
+        self,
+    ) -> Iterable[Callable]:  # TODO: move classes to make this work -> List[Union['Lambda', 'PipelineCallback']]:
         return self.opts.via
 
-    def add_via(self, callback: 'PipelineCallback') -> None:
+    def add_via(self, callback: Callable) -> None:
+        # TODO: move classes to be able to declare callback: Union['Lambda', 'PipelineCallback']
         self.opts.via.append(callback)
 
     @property
-    def cleanup(self) -> List['PipelineCallback']:
+    def cleanup(self) -> Iterable[Callable]:  # TODO: move classes to make this work -> Iterable['PipelineCallback']:
         return self.opts.cleanup
 
     def __str__(self):

src/pyff/utils.py

@@ -24,7 +24,7 @@
 from itertools import chain
 from threading import local
 from time import gmtime, strftime
-from typing import BinaryIO, Optional, Union
+from typing import Any, BinaryIO, Callable, Optional, Union
 
 import pkg_resources
 import requests
@@ -818,7 +818,7 @@ def json_serializer(o):
 
 
 class Lambda(object):
-    def __init__(self, cb, *args, **kwargs):
+    def __init__(self, cb: Callable, *args, **kwargs):
         self._cb = cb
         self._args = [a for a in args]
         self._kwargs = kwargs or {}