Allow all from_file overrides to set a stac_io implementation

Author: lossyrob

pystac/catalog.py

@@ -939,8 +939,8 @@ def full_copy(
         return cast(Catalog, super().full_copy(root, parent))
 
     @classmethod
-    def from_file(cls, href: str) -> "Catalog":
-        result = super().from_file(href)
+    def from_file(cls, href: str, stac_io: Optional[pystac.StacIO] = None) -> "Catalog":
+        result = super().from_file(href, stac_io)
         if not isinstance(result, Catalog):
             raise pystac.STACTypeError(f"{result} is not a {Catalog}.")
         return result

pystac/collection.py

@@ -749,8 +749,10 @@ def full_copy(
         return cast(Collection, super().full_copy(root, parent))
 
     @classmethod
-    def from_file(cls, href: str) -> "Collection":
-        result = super().from_file(href)
+    def from_file(
+        cls, href: str, stac_io: Optional[pystac.StacIO] = None
+    ) -> "Collection":
+        result = super().from_file(href, stac_io)
         if not isinstance(result, Collection):
             raise pystac.STACTypeError(f"{result} is not a {Collection}.")
         return result

pystac/item.py

@@ -973,8 +973,8 @@ def full_copy(
         return cast(Item, super().full_copy(root, parent))
 
     @classmethod
-    def from_file(cls, href: str) -> "Item":
-        result = super().from_file(href)
+    def from_file(cls, href: str, stac_io: Optional[pystac.StacIO] = None) -> "Item":
+        result = super().from_file(href, stac_io)
         if not isinstance(result, Item):
             raise pystac.STACTypeError(f"{result} is not a {Item}.")
         return result

pystac/stac_object.py

@@ -453,9 +453,8 @@ def from_file(
 
         if not is_absolute_href(href):
             href = make_absolute_href(href)
-        d = stac_io.read_json(href)
 
-        o = stac_io.stac_object_from_dict(d, href, None)
+        o = stac_io.read_stac_object(href)
 
         # Set the self HREF, if it's not already set to something else.
         if o.get_self_href() is None: