Merge branch 'main' into fix/rotate-rds-certs

Author: kukushking

awswrangler/_arrow.py

@@ -70,12 +70,15 @@ def _apply_timezone(df: pd.DataFrame, metadata: dict[str, Any]) -> pd.DataFrame:
         else:
             continue
         if col_name in df.columns and c["pandas_type"] == "datetimetz":
-            timezone: datetime.tzinfo = pa.lib.string_to_tzinfo(c["metadata"]["timezone"])
-            _logger.debug("applying timezone (%s) on column %s", timezone, col_name)
-            if hasattr(df[col_name].dtype, "tz") is False:
-                df[col_name] = df[col_name].dt.tz_localize(tz="UTC")
-            if timezone is not None and timezone != pytz.UTC and hasattr(df[col_name].dt, "tz_convert"):
-                df[col_name] = df[col_name].dt.tz_convert(tz=timezone)
+            column_metadata: dict[str, Any] = c["metadata"] if c.get("metadata") else {}
+            timezone_str: str | None = column_metadata.get("timezone")
+            if timezone_str:
+                timezone: datetime.tzinfo = pa.lib.string_to_tzinfo(timezone_str)
+                _logger.debug("applying timezone (%s) on column %s", timezone, col_name)
+                if hasattr(df[col_name].dtype, "tz") is False:
+                    df[col_name] = df[col_name].dt.tz_localize(tz="UTC")
+                if timezone is not None and timezone != pytz.UTC and hasattr(df[col_name].dt, "tz_convert"):
+                    df[col_name] = df[col_name].dt.tz_convert(tz=timezone)
     return df