Merge pull request #530 from l0b0/refactor/do-not-change-import-name-if-unnecessary

refactor: Don't change name of import if unnecessary

Author: Jon Duckworth

pystac/collection.py

@@ -1,5 +1,5 @@
 from copy import deepcopy
-from datetime import datetime as Datetime
+from datetime import datetime
 from enum import Enum
 from pystac.errors import STACTypeError
 from typing import (
@@ -175,7 +175,7 @@ class TemporalExtent:
         Datetimes are required to be in UTC.
     """
 
-    intervals: List[List[Optional[Datetime]]]
+    intervals: List[List[Optional[datetime]]]
     """A list of two datetimes wrapped in a list,
     representing the temporal extent of a Collection. Open date ranges are
     represented by either the start (the first element of the interval) or the
@@ -187,16 +187,16 @@ class TemporalExtent:
 
     def __init__(
         self,
-        intervals: Union[List[List[Optional[Datetime]]], List[Optional[Datetime]]],
+        intervals: Union[List[List[Optional[datetime]]], List[Optional[datetime]]],
         extra_fields: Optional[Dict[str, Any]] = None,
     ):
         # A common mistake is to pass in a single interval instead of a
         # list of intervals. Account for this by transforming the input
         # in that case.
-        if isinstance(intervals, list) and isinstance(intervals[0], Datetime):
-            self.intervals = [cast(List[Optional[Datetime]], intervals)]
+        if isinstance(intervals, list) and isinstance(intervals[0], datetime):
+            self.intervals = [cast(List[Optional[datetime]], intervals)]
         else:
-            self.intervals = cast(List[List[Optional[Datetime]]], intervals)
+            self.intervals = cast(List[List[Optional[datetime]]], intervals)
 
         self.extra_fields = extra_fields or {}
 
@@ -239,7 +239,7 @@ def from_dict(d: Dict[str, Any]) -> "TemporalExtent":
         Returns:
             TemporalExtent: The TemporalExtent deserialized from the JSON dict.
         """
-        parsed_intervals: List[List[Optional[Datetime]]] = []
+        parsed_intervals: List[List[Optional[datetime]]] = []
         for i in d["interval"]:
             start = None
             end = None
@@ -264,7 +264,7 @@ def from_now() -> "TemporalExtent":
             TemporalExtent: The resulting TemporalExtent.
         """
         return TemporalExtent(
-            intervals=[[Datetime.utcnow().replace(microsecond=0), None]]
+            intervals=[[datetime.utcnow().replace(microsecond=0), None]]
         )
 
 
@@ -360,9 +360,9 @@ def from_items(
             [float("-inf")],
             [float("-inf")],
         ]
-        datetimes: List[Datetime] = []
-        starts: List[Datetime] = []
-        ends: List[Datetime] = []
+        datetimes: List[datetime] = []
+        starts: List[datetime] = []
+        ends: List[datetime] = []
 
         for item in items:
             if item.bbox is not None:

pystac/extensions/timestamps.py

@@ -3,7 +3,7 @@
 https://github.com/stac-extensions/timestamps
 """
 
-from datetime import datetime as Datetime
+from datetime import datetime as datetime
 from pystac.summaries import RangeSummary
 from typing import Dict, Any, Iterable, Generic, Optional, TypeVar, cast
 
@@ -44,9 +44,9 @@ class TimestampsExtension(
 
     def apply(
         self,
-        published: Optional[Datetime] = None,
-        expires: Optional[Datetime] = None,
-        unpublished: Optional[Datetime] = None,
+        published: Optional[datetime] = None,
+        expires: Optional[datetime] = None,
+        unpublished: Optional[datetime] = None,
     ) -> None:
         """Applies timestamps extension properties to the extended Item.
 
@@ -63,7 +63,7 @@ def apply(
         self.unpublished = unpublished
 
     @property
-    def published(self) -> Optional[Datetime]:
+    def published(self) -> Optional[datetime]:
         """Gets or sets a datetime object that represents the date and time that the
         corresponding data was published the first time.
 
@@ -75,11 +75,11 @@ def published(self) -> Optional[Datetime]:
         return map_opt(str_to_datetime, self._get_property(PUBLISHED_PROP, str))
 
     @published.setter
-    def published(self, v: Optional[Datetime]) -> None:
+    def published(self, v: Optional[datetime]) -> None:
         self._set_property(PUBLISHED_PROP, map_opt(datetime_to_str, v))
 
     @property
-    def expires(self) -> Optional[Datetime]:
+    def expires(self) -> Optional[datetime]:
         """Gets or sets a datetime object that represents the date and time the
         corresponding data expires (is not valid any longer).
 
@@ -91,11 +91,11 @@ def expires(self) -> Optional[Datetime]:
         return map_opt(str_to_datetime, self._get_property(EXPIRES_PROP, str))
 
     @expires.setter
-    def expires(self, v: Optional[Datetime]) -> None:
+    def expires(self, v: Optional[datetime]) -> None:
         self._set_property(EXPIRES_PROP, map_opt(datetime_to_str, v))
 
     @property
-    def unpublished(self) -> Optional[Datetime]:
+    def unpublished(self) -> Optional[datetime]:
         """Gets or sets a datetime object that represents the date and time the
         corresponding data was unpublished.
 
@@ -107,7 +107,7 @@ def unpublished(self) -> Optional[Datetime]:
         return map_opt(str_to_datetime, self._get_property(UNPUBLISHED_PROP, str))
 
     @unpublished.setter
-    def unpublished(self, v: Optional[Datetime]) -> None:
+    def unpublished(self, v: Optional[datetime]) -> None:
         self._set_property(UNPUBLISHED_PROP, map_opt(datetime_to_str, v))
 
     @classmethod
@@ -206,7 +206,7 @@ class SummariesTimestampsExtension(SummariesExtension):
     """
 
     @property
-    def published(self) -> Optional[RangeSummary[Datetime]]:
+    def published(self) -> Optional[RangeSummary[datetime]]:
         """Get or sets the summary of :attr:`TimestampsExtension.published` values
         for this Collection.
         """
@@ -219,7 +219,7 @@ def published(self) -> Optional[RangeSummary[Datetime]]:
         )
 
     @published.setter
-    def published(self, v: Optional[RangeSummary[Datetime]]) -> None:
+    def published(self, v: Optional[RangeSummary[datetime]]) -> None:
         self._set_summary(
             PUBLISHED_PROP,
             map_opt(
@@ -231,7 +231,7 @@ def published(self, v: Optional[RangeSummary[Datetime]]) -> None:
         )
 
     @property
-    def expires(self) -> Optional[RangeSummary[Datetime]]:
+    def expires(self) -> Optional[RangeSummary[datetime]]:
         """Get or sets the summary of :attr:`TimestampsExtension.expires` values
         for this Collection.
         """
@@ -244,7 +244,7 @@ def expires(self) -> Optional[RangeSummary[Datetime]]:
         )
 
     @expires.setter
-    def expires(self, v: Optional[RangeSummary[Datetime]]) -> None:
+    def expires(self, v: Optional[RangeSummary[datetime]]) -> None:
         self._set_summary(
             EXPIRES_PROP,
             map_opt(
@@ -256,7 +256,7 @@ def expires(self, v: Optional[RangeSummary[Datetime]]) -> None:
         )
 
     @property
-    def unpublished(self) -> Optional[RangeSummary[Datetime]]:
+    def unpublished(self) -> Optional[RangeSummary[datetime]]:
         """Get or sets the summary of :attr:`TimestampsExtension.unpublished` values
         for this Collection.
         """
@@ -269,7 +269,7 @@ def unpublished(self) -> Optional[RangeSummary[Datetime]]:
         )
 
     @unpublished.setter
-    def unpublished(self, v: Optional[RangeSummary[Datetime]]) -> None:
+    def unpublished(self, v: Optional[RangeSummary[datetime]]) -> None:
         self._set_summary(
             UNPUBLISHED_PROP,
             map_opt(