Browse Source

Merge branch 'master' into develop

pull/1200/head
JackDandy 6 years ago
parent
commit
9a7d1c8186
  1. 5
      CHANGES.md
  2. 6
      sickbeard/network_timezones.py

5
CHANGES.md

@ -33,6 +33,11 @@
### 0.19.10 (2019-07-10 17:42:00 UTC)
* Fix catch error on systems with no local timezone
### 0.19.9 (2019-07-05 23:30:00 UTC) ### 0.19.9 (2019-07-05 23:30:00 UTC)
* Change Anonymous redirect misuse of dereferer.org (was removed from SG in 2015) to nullrefer.com service * Change Anonymous redirect misuse of dereferer.org (was removed from SG in 2015) to nullrefer.com service

6
sickbeard/network_timezones.py

@ -75,7 +75,11 @@ def tz_fallback(t):
def get_tz(): def get_tz():
t = get_localzone() t = None
try:
t = get_localzone()
except (BaseException, Exception):
pass
if isinstance(t, datetime.tzinfo) and hasattr(t, 'zone') and t.zone and hasattr(sickbeard, 'ZONEINFO_DIR'): if isinstance(t, datetime.tzinfo) and hasattr(t, 'zone') and t.zone and hasattr(sickbeard, 'ZONEINFO_DIR'):
try: try:
t = tz_fallback(tz.gettz(t.zone, zoneinfo_priority=True)) t = tz_fallback(tz.gettz(t.zone, zoneinfo_priority=True))

Loading…
Cancel
Save