changeset 43cb67972361 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=43cb67972361 description: [fschmaus] Improve XEP-0082 support. Fixes #7814

diffstat:

src/common/connection_handlers_events.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r ac09400aded7 -r 43cb67972361 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Aug 22 15:44:07 2014 +0200 +++ b/src/common/connection_handlers_events.py Sun Sep 07 21:51:06 2014 +0200 @@ -222,12 +222,21 @@ def dst(self, dt): return ZERO

+ if utc_time[-1:] == 'Z': + # Remove the trailing 'Z' + utc_time = utc_time[:-1] + elif utc_time[-6:] == "+00:00": + # Remove the trailing "+00:00" + utc_time = utc_time[:-6] + else: + log.info("Wrong timezone defintion: %s" % str(e)) + return try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S') except ValueError, e: try: t = datetime.datetime.strptime(utc_time, - '%Y-%m-%dT%H:%M:%S.%fZ') + '%Y-%m-%dT%H:%M:%S.%f') except ValueError, e: log.info('Wrong time format: %s' % str(e)) return