Skip to content

Add support for zoneinfo UTC timestamps #40613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
claudevdm merged 2 commits into from
Oct 15, 2026
Merged

Add support for zoneinfo UTC timestamps #40613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41485e1
Add support for zoneinfo UTC timestamps
jrmccluskey Oct 15, 2026
51da4d5
review feedback
jrmccluskey Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sdks/python/apache_beam/utils/timestamp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import datetime
import re
import time
import zoneinfo
from typing import Optional
from typing import Union
from typing import overload
Expand Down Expand Up @@ -166,7 +167,8 @@ def from_utc_datetime(cls, dt: datetime.datetime) -> 'Timestamp':
"dt has no timezone info " +
"(https://docs.python.org/3/library/datetime.html" +
"#aware-and-naive-objects): %s" % dt)
if dt.tzinfo != pytz.utc and dt.tzinfo != datetime.timezone.utc:
if dt.tzinfo != pytz.utc and dt.tzinfo != datetime.timezone.utc and not (
isinstance(dt.tzinfo, zoneinfo.ZoneInfo) and dt.tzinfo.key == 'UTC'):
raise ValueError('dt not in UTC: %s' % dt)
Comment thread
jrmccluskey marked this conversation as resolved.
duration = dt - cls._epoch_datetime_utc()
# Avoid total_seconds(): its float result can be off by a microsecond.
Expand Down
5 changes: 5 additions & 0 deletions sdks/python/apache_beam/utils/timestamp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import datetime
import unittest
import zoneinfo

import pytz
from google.protobuf import duration_pb2
Expand Down Expand Up @@ -86,6 +87,10 @@ def test_from_utc_datetime(self):
Timestamp.from_utc_datetime(
datetime.datetime(1970, 1, 1, tzinfo=pytz.utc)),
Timestamp(0))
self.assertEqual(
Timestamp.from_utc_datetime(
datetime.datetime(1970, 1, 1, tzinfo=zoneinfo.ZoneInfo("UTC"))),
Timestamp(0))
with self.assertRaisesRegex(ValueError, r'UTC'):
Timestamp.from_utc_datetime(
datetime.datetime(1970, 1, 1, tzinfo=pytz.timezone('US/Eastern')))
Expand Down
Loading