From 7d9fda625fd5e16c91a9b95920c477f857193389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 7 Feb 2023 10:32:36 +0100 Subject: Implement zoneinfo support to drop dependency to pytz MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zoneinfo was introduced within python 3.9. The support of pytz will be removed within RHEL 10 [1]. 2023.2 (bobcat) will move our testing runtime to py3.9 and py3.10 so we want to see pytz removed within this series. tzdata is required at runtime in our gates, because, by default, zoneinfo uses the system’s time zone data if available; if no system time zone data is available, the library will fall back to using the first-party tzdata package available on PyPI. Apparently our gates have no time zone data available nor tzdata installed by default because we get the following error without tzdata installed [3]: `ModuleNotFoundError: No module named 'tzdata' So I prefer to add tzdata in our requirements to avoid runtime failure related to time zone and ensure that time zone are always available. [1] https://issues.redhat.com/browse/RHEL-219 [2] https://review.opendev.org/c/openstack/governance/+/872232 [3] https://zuul.opendev.org/t/openstack/build/0a1576775e894b09bc31269fea00ba03/log/job-output.txt#1445` Depends-on: https://review.opendev.org/c/openstack/requirements/+/875854 Change-Id: I1f88bdadc68bfa726eac1da1c5824c1ed352ad98 --- oslo_utils/timeutils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'oslo_utils') diff --git a/oslo_utils/timeutils.py b/oslo_utils/timeutils.py index 390be53..ba45fda 100644 --- a/oslo_utils/timeutils.py +++ b/oslo_utils/timeutils.py @@ -22,9 +22,9 @@ import datetime import functools import logging import time +import zoneinfo import iso8601 -import pytz from oslo_utils import reflection @@ -225,8 +225,8 @@ def unmarshall_time(tyme): if tzname: # Need to handle either iso8601 or python UTC format tzname = 'UTC' if tzname == 'UTC+00:00' else tzname - tzinfo = pytz.timezone(tzname) - dt = tzinfo.localize(dt) + tzinfo = zoneinfo.ZoneInfo(tzname) + dt = dt.replace(tzinfo=tzinfo) return dt -- cgit v1.2.1