More obvious type names

Author: duckontheweb

pystac/asset.py

@@ -6,6 +6,7 @@
 
 if TYPE_CHECKING:
     from pystac.collection import Collection as Collection_Type
+    from pystac.common_metadata import CommonMetadata as CommonMetadata_Type
     from pystac.item import Item as Item_Type
 
 
@@ -147,7 +148,7 @@ def clone(self) -> "Asset":
         )
 
     @property
-    def common_metadata(self) -> common_metadata.CommonMetadata:
+    def common_metadata(self) -> "CommonMetadata_Type":
         """Access the asset's common metadata fields as a
         :class:`~pystac.CommonMetadata` object."""
         return common_metadata.CommonMetadata(self)

pystac/common_metadata.py

@@ -6,9 +6,9 @@
 from pystac import utils
 
 if TYPE_CHECKING:
-    from pystac.provider import Provider
-    from pystac.asset import Asset
-    from pystac.item import Item
+    from pystac.provider import Provider as Provider_Type
+    from pystac.asset import Asset as Asset_Type
+    from pystac.item import Item as Item_Type
 
 
 P = TypeVar("P")
@@ -23,17 +23,17 @@ class CommonMetadata:
         properties : Dictionary of attributes that is the Item's properties
     """
 
-    object: Union["Asset", "Item"]
+    object: Union["Asset_Type", "Item_Type"]
     """The object from which common metadata is obtained."""
 
-    def __init__(self, object: Union["Asset", "Item"]):
+    def __init__(self, object: Union["Asset_Type", "Item_Type"]):
         self.object = object
 
     def _set_field(self, prop_name: str, v: Optional[Any]) -> None:
         if hasattr(self.object, prop_name):
             setattr(self.object, prop_name, v)
         elif hasattr(self.object, "properties"):
-            item = cast("Item", self.object)
+            item = cast("Item_Type", self.object)
             if v is None:
                 item.properties.pop(prop_name, None)
             else:
@@ -54,7 +54,7 @@ def _get_field(self, prop_name: str, _typ: Type[P]) -> Optional[P]:
         if hasattr(self.object, prop_name):
             return cast(Optional[P], getattr(self.object, prop_name))
         elif hasattr(self.object, "properties"):
-            item = cast("Item", self.object)
+            item = cast("Item_Type", self.object)
             return item.properties.get(prop_name)
         elif hasattr(self.object, "extra_fields") and isinstance(
             self.object.extra_fields, Dict
@@ -117,15 +117,15 @@ def license(self, v: Optional[str]) -> None:
 
     # Providers
     @property
-    def providers(self) -> Optional[List["Provider"]]:
+    def providers(self) -> Optional[List["Provider_Type"]]:
         """Get or set a list of the object's providers."""
         return utils.map_opt(
             lambda providers: [pystac.Provider.from_dict(d) for d in providers],
             self._get_field("providers", List[Dict[str, Any]]),
         )
 
     @providers.setter
-    def providers(self, v: Optional[List["Provider"]]) -> None:
+    def providers(self, v: Optional[List["Provider_Type"]]) -> None:
         self._set_field(
             "providers",
             utils.map_opt(lambda providers: [p.to_dict() for p in providers], v),