fixup: fix timezone getting passed to Literal op

Author: NickCrews

ibis/common/temporal.py

@@ -203,7 +203,7 @@ def normalize_timedelta(
     return int(value)
 
 
-def normalize_timezone(tz):
+def normalize_timezone(tz) -> datetime.tzinfo | None:
     if tz is None:
         return None
     elif isinstance(tz, str):

ibis/expr/api.py

@@ -904,7 +904,7 @@ def timestamp(
     else:
         value = normalize_datetime(value_or_year)
         tzinfo = normalize_timezone(timezone or value.tzinfo)
-        timezone = tzinfo.tzname(value) if tzinfo is not None else None
+        value = value.astimezone(tzinfo) if tzinfo is not None else value
         dtype = dt.Timestamp.from_datetime(value, nullable=nullable)
         return literal(value, type=dtype)
 

ibis/expr/datatypes/core.py

@@ -760,11 +760,12 @@ def from_datetime(cls, dt: pydatetime.datetime, *, nullable: bool = True):
             scale = 6
         else:
             scale = 0
-        if dt.tzinfo is not None:
-            timezone = str(dt.tzinfo)
+
+        if (tzinfo := dt.tzinfo) is not None:
+            timezone_string = tzinfo.tzname(dt)
         else:
-            timezone = None
-        return cls(scale=scale, timezone=timezone, nullable=nullable)
+            timezone_string = None
+        return cls(scale=scale, timezone=timezone_string, nullable=nullable)
 
     @classmethod
     def from_pandas(