From e1b601f92371d6f042d0fef0433ada63145c13cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 28 Apr 2026 19:32:51 +0200 Subject: [PATCH] Remove dependency to pytz and backports.entry-points-selectable --- trytond/pyproject.toml | 2 -- trytond/trytond/tools/timezone.py | 19 ++++--------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/trytond/pyproject.toml b/trytond/pyproject.toml index 34f07e341b..1b2731ade7 100644 --- a/trytond/pyproject.toml +++ b/trytond/pyproject.toml @@ -7,14 +7,12 @@ name = 'trytond' dynamic = ['version', 'authors', 'readme'] dependencies = [ 'Genshi', - 'backports.entry-points-selectable; python_version < "3.10"', 'defusedxml', 'lxml >= 2.0', 'polib', 'pwdlib[argon2] >= 0.2', 'python-dateutil', 'python-sql >= 1.8', - 'pytz; python_version < "3.9"', 'relatorio[fodt] >= 0.7.0', 'simpleeval', 'werkzeug >= 0.12', diff --git a/trytond/trytond/tools/timezone.py b/trytond/trytond/tools/timezone.py index ca62e4fe18..c229a84142 100644 --- a/trytond/trytond/tools/timezone.py +++ b/trytond/trytond/tools/timezone.py @@ -2,18 +2,10 @@ # this repository contains the full copyright notices and license terms. import logging import os +import zoneinfo -try: - import zoneinfo - ZoneInfo = zoneinfo.ZoneInfo - ZoneInfoNotFoundError = zoneinfo.ZoneInfoNotFoundError -except ImportError: - zoneinfo = None - import pytz - from dateutil.tz import gettz as ZoneInfo - - class ZoneInfoNotFoundError(KeyError): - pass +ZoneInfo = zoneinfo.ZoneInfo +ZoneInfoNotFoundError = zoneinfo.ZoneInfoNotFoundError __all__ = ['SERVER', 'UTC', 'get_tzinfo', 'available_timezones'] logger = logging.getLogger(__name__) @@ -24,10 +16,7 @@ def available_timezones(): global _ALL_ZONES if not _ALL_ZONES: - if zoneinfo: - _ALL_ZONES = zoneinfo.available_timezones() - else: - _ALL_ZONES = set(pytz.all_timezones) + _ALL_ZONES = zoneinfo.available_timezones() return set(_ALL_ZONES)