From 96af028daa0e53050dbd460e626b6d17981b63f7 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sun, 17 Jul 2022 22:59:49 +0200 Subject: [PATCH] feat(playout): replace pytz with zoneinfo (#1969) --- playout/libretime_playout/recorder.py | 10 ++++++---- playout/requirements.txt | 2 +- playout/setup.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/playout/libretime_playout/recorder.py b/playout/libretime_playout/recorder.py index 222584153..95c40f2dd 100644 --- a/playout/libretime_playout/recorder.py +++ b/playout/libretime_playout/recorder.py @@ -6,11 +6,12 @@ import re import signal import time import traceback +from datetime import timezone from subprocess import PIPE, Popen from threading import Thread +from zoneinfo import ZoneInfo import mutagen -import pytz from libretime_api_client.version1 import AirtimeApiClient as AirtimeApiClientV1 from loguru import logger @@ -277,11 +278,12 @@ class Recorder(Thread): show_name = self.shows_to_record[start_time][2] server_timezone = self.shows_to_record[start_time][3] - T = pytz.timezone(server_timezone) + server_tz = ZoneInfo(server_timezone) start_time_on_UTC = getDateTimeObj(start_time) start_time_on_server = start_time_on_UTC.replace( - tzinfo=pytz.utc - ).astimezone(T) + tzinfo=timezone.utc + ).astimezone(server_tz) + start_time_formatted = ( "%(year)d-%(month)02d-%(day)02d %(hour)02d:%(min)02d:%(sec)02d" % { diff --git a/playout/requirements.txt b/playout/requirements.txt index 3b3fe410a..4c23dc8f8 100644 --- a/playout/requirements.txt +++ b/playout/requirements.txt @@ -1,8 +1,8 @@ # Please do not edit this file, edit the setup.py file! # This file is auto-generated by tools/extract_requirements.py. +backports.zoneinfo>=0.2.1,<0.3;python_version<'3.9' defusedxml>=0.6.0,<0.8 kombu==4.6.11 mutagen>=1.45.1,<1.46 -pytz requests>=2.25.1,<2.29 typing-extensions diff --git a/playout/setup.py b/playout/setup.py index 95c4d26b1..7b6efeb03 100644 --- a/playout/setup.py +++ b/playout/setup.py @@ -30,10 +30,10 @@ setup( }, python_requires=">=3.6", install_requires=[ + "backports.zoneinfo>=0.2.1,<0.3;python_version<'3.9'", "defusedxml>=0.6.0,<0.8", "kombu==4.6.11", "mutagen>=1.45.1,<1.46", - "pytz", "requests>=2.25.1,<2.29", "typing-extensions", ],