monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #688 from JackDandy/feature/ChangeTimezoneTypeCheck

Browse source 
Change check for parameter types in parse_date_time.
This commit is contained in:
JackDandy 2016-05-02 19:29:20 +01:00
commit f3fc3f4b7a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sickbeard/network_timezones.py
View file

@ -266,7 +266,7 @@ def get_network_timezone(network):
except:
pass
return timezone if timezone is not None else sb_timezone
return timezone if isinstance(timezone, datetime.tzinfo) else sb_timezone
def parse_time(t):
@ -306,17 +306,17 @@ def parse_time(t):
# parse date and time string into local time
def parse_date_time(d, t, network):
if isinstance(t, basestring):
(hr, m) = parse_time(t)
else:
if isinstance(t, tuple) and len(t) == 2 and isinstance(t[0], int) and isinstance(t[1], int):
(hr, m) = t
else:
(hr, m) = parse_time(t)
te = datetime.datetime.fromordinal(helpers.tryInt(d))
try:
if isinstance(network, basestring):
foreign_timezone = get_network_timezone(network)
else:
if isinstance(network, datetime.tzinfo):
foreign_timezone = network
else:
foreign_timezone = get_network_timezone(network)
foreign_naive = datetime.datetime(te.year, te.month, te.day, hr, m, tzinfo=foreign_timezone)
return foreign_naive
except: