type, import and documentation fixes

Author: fredrikt

src/pyff/api.py

@@ -2,7 +2,7 @@
 import threading
 from datetime import datetime, timedelta
 from json import dumps
-from typing import Any, List, Mapping, Iterator
+from typing import Any, Iterable, List, Mapping
 
 import pkg_resources
 import pyramid.httpexceptions as exc
@@ -389,7 +389,7 @@ def resources_handler(request):
     :return: a JSON representation of the set of resources currently loaded by the server
     """
 
-    def _infos(resources: Iterator[Resource]) -> List[Mapping[str, Any]]:
+    def _infos(resources: Iterable[Resource]) -> List[Mapping[str, Any]]:
         return list(filter(lambda i: 'State' in i and i['State'] is not None, [_info(r) for r in resources]))
 
     def _info(r: Resource) -> Mapping[str, Any]:

src/pyff/resource.py

@@ -21,7 +21,6 @@
 from .exceptions import ResourceException
 from .fetch import make_fetcher
 from .logs import get_log
-from .parse import parse_resource
 from .utils import Watchable, hex_digest, img_to_data, non_blocking_lock, resource_string, safe_write, url_get, utc_now
 
 requests.packages.urllib3.disable_warnings()
@@ -363,6 +362,9 @@ def load_resource(self, getter: Callable[[str], Response]) -> Tuple[Optional[str
     def parse(self, getter):
         data, status, info = self.load_resource(getter)
         info['State'] = 'Parsing'
+        # local import to avoid circular import
+        from .parse import parse_resource
+
         parse_info = parse_resource(self, data)
         if parse_info is not None and isinstance(parse_info, dict):
             info.update(parse_info)

src/pyff/samlmd.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from distutils.util import strtobool
 from itertools import chain
-from typing import Any, Dict, Mapping, Optional
+from typing import Any, Dict, Mapping
 
 from lxml import etree
 from lxml.builder import ElementMaker
@@ -224,9 +224,11 @@ def parse(self, resource: Resource, content: str) -> Mapping[str, Any]:
             info['NextUpdate'] = next_update
             resource.expire_time = iso2datetime(next_update)
         elif config.respect_cache_duration:
-            now = utc_now()
-            now = now.replace(microsecond=0)
-            next_update = now + duration2timedelta(config.default_cache_duration)
+            _duration = duration2timedelta(config.default_cache_duration)
+            if not _duration:
+                raise ValueError('Invalid default_cache_duration')
+            now = utc_now().replace(microsecond=0)
+            next_update = now + _duration
             info['NextUpdate'] = next_update
             resource.expire_time = next_update
 
@@ -377,9 +379,9 @@ def entitiesdescriptor(
     :param cache_duration: an XML timedelta expression, eg PT1H for 1hr
     :param valid_until: a relative time eg 2w 4d 1h for 2 weeks, 4 days and 1hour from now.
     :param copy: set to False to avoid making a copy of all the entities in list. This may be dangerous.
-    :param validate: set to False to skip schema validation of the resulting EntitiesDesciptor element. This is dangerous!
-    :param filter_invalid: remove invalid entitiesdescriptor elements from aggregate
-    :param nsmap: additional namespace definitions to include in top level entitiesdescriptor element
+    :param validate: set to False to skip schema validation of the resulting EntitiesDescriptor element. This is dangerous!
+    :param filter_invalid: remove invalid EntitiesDescriptor elements from aggregate
+    :param nsmap: additional namespace definitions to include in top level EntitiesDescriptor element
 
     Produce an EntityDescriptors set from a list of entities. Optional Name, cacheDuration and validUntil are affixed.
     """