From 93351156a122dd7e374778c1c838b5c4c1dda83d Mon Sep 17 00:00:00 2001 From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13" Date: Wed, 14 Jul 2010 18:26:01 +0000 Subject: history time is now correct. fixed #1571 --- src/common.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/common.py') diff --git a/src/common.py b/src/common.py index 3edc9e14..4406e4cb 100644 --- a/src/common.py +++ b/src/common.py @@ -33,7 +33,7 @@ """ various useful functions """ - +from datetime import datetime, timedelta import base64 import os import mimetypes @@ -44,6 +44,7 @@ import sys import select import errno import xmpp +import time def debug(string): """ @@ -261,7 +262,8 @@ def datetime_tuple(timestamp): """ timestamp = timestamp.split('.')[0] timestamp = timestamp.replace('-', '') - timestamp = timestamp.replace('z', '') - timestamp = timestamp.replace('Z', '') - from datetime import datetime - return datetime.strptime(timestamp, '%Y%m%dT%H:%M:%S') + ret = datetime.strptime(timestamp, '%Y%m%dT%H:%M:%SZ') + # convert UTC to local time, with DST etc. + dst = timedelta(seconds=time.altzone) + ret -= dst + return ret -- cgit v1.2.3