From 923082b58dc59f2af8d039d0ba03e7970e191b79 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 10 Feb 2023 16:36:20 -0500 Subject: [PATCH 1/3] Pass tz object instead of text for tz fallback --- app/classes/shared/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 1b277a76..f9927eba 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -14,6 +14,7 @@ import glob # TZLocal is set as a hidden import on win pipeline from tzlocal import get_localzone +from zoneinfo import ZoneInfo from tzlocal.utils import ZoneInfoNotFoundError from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.jobstores.base import JobLookupError @@ -136,7 +137,7 @@ class ServerInstance: logger.error( "Could not capture time zone from system. Falling back to Europe/London" ) - self.tz = "Europe/London" + self.tz = ZoneInfo("Europe/London") self.server_scheduler = BackgroundScheduler(timezone=str(self.tz)) self.server_scheduler.start() self.backup_thread = threading.Thread( From 52833d8126e9f0eab2f439bdff54b682db11ff1c Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Fri, 10 Feb 2023 18:03:49 -0500 Subject: [PATCH 2/3] Appease the linter --- app/classes/shared/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index f9927eba..780f550a 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -12,9 +12,10 @@ import html import urllib.request import glob +from zoneinfo import ZoneInfo + # TZLocal is set as a hidden import on win pipeline from tzlocal import get_localzone -from zoneinfo import ZoneInfo from tzlocal.utils import ZoneInfoNotFoundError from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.jobstores.base import JobLookupError From 43a5018013717bf6a82acaaba0d83f25a486d971 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 11 Feb 2023 19:13:37 +0000 Subject: [PATCH 3/3] Update changelog !556 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8d4c4c9..f15d616c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Bug fixes - Fix exception related to page data on server start ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/544)) - Fix logical issue with uploading dynamic files ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/555)) +- Fix backups failing by correctly using tz objects ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/556)) ### Tweaks - Cleanup authentication helpers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/545)) - Optimize file upload progress WS ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/546))