Merge pull request #375 from schwehr/optional

cache.py, layout.py: Add missing Optional type annotations

Author: lossyrob

pystac/cache.py

@@ -63,7 +63,7 @@ def __init__(
         self,
         id_keys_to_objects: Optional[Dict[str, "STACObject_Type"]] = None,
         hrefs_to_objects: Optional[Dict[str, "STACObject_Type"]] = None,
-        ids_to_collections: Dict[str, "Collection_Type"] = None,
+        ids_to_collections: Optional[Dict[str, "Collection_Type"]] = None,
     ):
         self.id_keys_to_objects = id_keys_to_objects or {}
         self.hrefs_to_objects = hrefs_to_objects or {}
@@ -235,8 +235,12 @@ class CollectionCache:
 
     def __init__(
         self,
-        cached_ids: Dict[str, Union["Collection_Type", Dict[str, Any]]] = None,
-        cached_hrefs: Dict[str, Union["Collection_Type", Dict[str, Any]]] = None,
+        cached_ids: Optional[
+            Dict[str, Union["Collection_Type", Dict[str, Any]]]
+        ] = None,
+        cached_hrefs: Optional[
+            Dict[str, Union["Collection_Type", Dict[str, Any]]]
+        ] = None,
     ):
         self.cached_ids = cached_ids or {}
         self.cached_hrefs = cached_hrefs or {}
@@ -273,8 +277,12 @@ class ResolvedObjectCollectionCache(CollectionCache):
     def __init__(
         self,
         resolved_object_cache: ResolvedObjectCache,
-        cached_ids: Dict[str, Union["Collection_Type", Dict[str, Any]]] = None,
-        cached_hrefs: Dict[str, Union["Collection_Type", Dict[str, Any]]] = None,
+        cached_ids: Optional[
+            Dict[str, Union["Collection_Type", Dict[str, Any]]]
+        ] = None,
+        cached_hrefs: Optional[
+            Dict[str, Union["Collection_Type", Dict[str, Any]]]
+        ] = None,
     ):
         super().__init__(cached_ids, cached_hrefs)
         self.resolved_object_cache = resolved_object_cache

pystac/layout.py

@@ -74,7 +74,9 @@ class LayoutTemplate:
     # Special template vars specific to Items
     ITEM_TEMPLATE_VARS = ["date", "year", "month", "day", "collection"]
 
-    def __init__(self, template: str, defaults: Dict[str, str] = None) -> None:
+    def __init__(
+        self, template: str, defaults: Optional[Dict[str, str]] = None
+    ) -> None:
         self.template = template
         self.defaults = defaults or {}