Merge pull request #794 from JackDandy/feature/ChangeAddFallbackTzinfo

Change use legacy tzlocal if new gettz returns nothing.
This commit is contained in:
JackDandy 2016-10-03 18:27:38 +01:00 committed by GitHub
commit 0c3e462fe4
2 changed files with 2 additions and 1 deletions

View file

@ -195,6 +195,7 @@
* Update Tornado Web Server 4.3.dev1 (1b6157d) to 4.4.dev1 (c2b4d05)
* Change add support for freebsd /var/db/zoneinfo when getting local timezone information
* Fix issue with post processing propers/repacks
* Change use legacy tzlocal() if new gettz fails to create
### 0.11.15 (2016-09-13 19:50:00 UTC)

View file

@ -57,7 +57,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.gettz(t.zone)
t = tz_fallback(tz.gettz(t.zone))
except:
t = tz_fallback(t)
else: