copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[fschmaus] Improve XEP-0082 support. Fixes #7814

Browse source
This commit is contained in:
Yann Leboulanger 2014-09-07 21:51:06 +02:00
parent 1b6550a0e3
commit a0d752b3ab
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common/connection_handlers_events.py
View file

@ -220,12 +220,21 @@ class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
def dst(self, dt): def dst(self, dt):
return ZERO 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: 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: except ValueError:
try: try:
t = datetime.datetime.strptime(utc_time, t = datetime.datetime.strptime(utc_time,
'%Y-%m-%dT%H:%M:%S.%fZ') '%Y-%m-%dT%H:%M:%S.%f')
except ValueError as e: except ValueError as e:
log.info('Wrong time format: %s' % str(e)) log.info('Wrong time format: %s' % str(e))
return return