From fbb071b87b0786fca8a6249916f7b4bb240bd7c0 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Wed, 11 Mar 2020 22:16:55 +0000 Subject: [PATCH] Fix get_network_timezone. --- CHANGES.md | 7 ++++++- sickbeard/network_timezones.py | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9dddb1d..c932253 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.21.20 (2019-03-11 18:35:00 UTC) +### 0.21.21 (2019-03-11 21:15:00 UTC) + +* Fix get_network_timezone + + +### 0.21.20 (2019-03-11 18:35:00 UTC) * Fix timezone handling on Windows to correct timestamps related to file system and db episode management diff --git a/sickbeard/network_timezones.py b/sickbeard/network_timezones.py index 0515eab..50a552e 100644 --- a/sickbeard/network_timezones.py +++ b/sickbeard/network_timezones.py @@ -412,11 +412,11 @@ def get_network_timezone(network, return_name=False): except (BaseException, Exception): pass - if isinstance(timezone, datetime.tzinfo): - return timezone + if not isinstance(timezone, datetime.tzinfo): + timezone = SG_TIMEZONE if return_name: - return SG_TIMEZONE, timezone_name - return SG_TIMEZONE + return timezone, timezone_name + return timezone def parse_time(t):