Allow Column type for arguments in timestamp functions (zero323#380)

charlietsai · Mar 26, 2020 · 726501b · 726501b
1 parent 3c4684a
commit 726501b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/third_party/3/pyspark/sql/functions.pyi b/third_party/3/pyspark/sql/functions.pyi
@@ -97,8 +97,8 @@ def from_unixtime(timestamp: ColumnOrName, format: str = ...) -> Column: ...
 def unix_timestamp(
     timestamp: Optional[ColumnOrName] = ..., format: str = ...
 ) -> Column: ...
-def from_utc_timestamp(timestamp: ColumnOrName, tz: str) -> Column: ...
-def to_utc_timestamp(timestamp: ColumnOrName, tz: str) -> Column: ...
+def from_utc_timestamp(timestamp: ColumnOrName, tz: Union[Column, str]) -> Column: ...
+def to_utc_timestamp(timestamp: ColumnOrName, tz: Union[Column, str]) -> Column: ...
 def window(
     timeColumn: ColumnOrName,
     windowDuration: str,