From 35b282e797822a21304413a7b5d2c753eb0e0372 Mon Sep 17 00:00:00 2001 From: Prinz23 Date: Sat, 5 Aug 2017 01:08:28 +0200 Subject: [PATCH] Change add new zoneinfo_priority parameter to all gettz() calls. --- sickbeard/network_timezones.py | 7 ++++--- sickbeard/webserve.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sickbeard/network_timezones.py b/sickbeard/network_timezones.py index 0010a0bf..22dc1c79 100644 --- a/sickbeard/network_timezones.py +++ b/sickbeard/network_timezones.py @@ -78,7 +78,7 @@ def get_tz(): t = get_localzone() if isinstance(t, datetime.tzinfo) and hasattr(t, 'zone') and t.zone and hasattr(sickbeard, 'ZONEINFO_DIR'): try: - t = tz_fallback(tz.gettz(t.zone)) + t = tz_fallback(tz.gettz(t.zone, zoneinfo_priority=True)) except: t = tz_fallback(t) else: @@ -303,14 +303,15 @@ def get_network_timezone(network): if not network_dict: load_network_dict() try: - timezone = tz.gettz(network_dupes.get(network) or network_dict.get(network.replace(' ', '').lower())) + timezone = tz.gettz(network_dupes.get(network) or network_dict.get(network.replace(' ', '').lower()), + zoneinfo_priority=True) except: pass if timezone is None: cc = re.search(r'\(([a-z]+)\)$', network, flags=re.I) try: - timezone = tz.gettz(country_timezones.get(cc.group(1).upper())) + timezone = tz.gettz(country_timezones.get(cc.group(1).upper()), zoneinfo_priority=True) except: pass except: diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 0ec973a8..f30bc6a5 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -224,7 +224,7 @@ class CalendarHandler(BaseHandler): # Limit dates past_date = (datetime.date.today() + datetime.timedelta(weeks=-52)).toordinal() future_date = (datetime.date.today() + datetime.timedelta(weeks=52)).toordinal() - utc = tz.gettz('GMT') + utc = tz.gettz('GMT', zoneinfo_priority=True) # Get all the shows that are not paused and are currently on air myDB = db.DBConnection()