From e7479c52e2f68e68427f7589255d4d4d42cd158f Mon Sep 17 00:00:00 2001 From: lovetox Date: Sat, 8 Oct 2016 17:38:10 +0200 Subject: [PATCH] [pitchum] Fix datetime parsing - Fixes #8444 --- src/common/helpers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/helpers.py b/src/common/helpers.py index 6f32ee0f7..7d11e77f2 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -613,8 +613,12 @@ def datetime_tuple(timestamp): tim = tim.split('.')[0] tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') if zone: - tim = datetime.datetime.fromtimestamp(time.mktime(t)) - zone = strptime.time(zone, '%H:%M') + zone = zone.replace(':', '') + tim = datetime.datetime.fromtimestamp(time.mktime(tim)) + if len(zone) > 2: + zone = time.strptime(zone, '%H%M') + else: + zone = time.strptime(zone, '%H') zone = datetime.timedelta(hours=zone.tm_hour, minutes=zone.tm_min) tim += zone * sign tim = tim.timetuple()