From 3a548491a962258e16ed50da595ab16b1de7aa60 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 1 Dec 2008 10:56:14 +0000
Subject: [PATCH] strftime doesn't support %T. It works under linux (why?) but
not under windows. Fixes #4526
---
src/common/connection.py | 2 +-
src/common/connection_handlers.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/common/connection.py b/src/common/connection.py
index 7c133b4228..996c25575d 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1175,7 +1175,7 @@ class Connection(ConnectionHandlers):
if delayed:
our_jid = gajim.get_jid_from_account(self.name) + '/' + \
self.server_resource
- timestamp = time.strftime('%Y-%m-%dT%TZ', time.gmtime(delayed))
+ timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(delayed))
msg_iq.addChild('delay', namespace=common.xmpp.NS_DELAY2,
attrs={'from': our_jid, 'stamp': timestamp})
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index bf11c9b0d9..4b384791ca 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1579,7 +1579,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
return
iq_obj = iq_obj.buildReply('result')
qp = iq_obj.getTag('query')
- qp.setTagData('utc', strftime('%Y%m%dT%T', gmtime()))
+ qp.setTagData('utc', strftime('%Y%m%dT%H:%M:%S', gmtime()))
qp.setTagData('tz', helpers.decode_string(tzname[daylight]))
qp.setTagData('display', helpers.decode_string(strftime('%c',
localtime())))
@@ -1593,7 +1593,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
iq_obj = iq_obj.buildReply('result')
qp = iq_obj.setTag('time',
namespace=common.xmpp.NS_TIME_REVISED)
- qp.setTagData('utc', strftime('%Y-%m-%dT%TZ', gmtime()))
+ qp.setTagData('utc', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()))
zone = -(timezone, altzone)[daylight] / 60
tzo = (zone / 60, abs(zone % 60))
qp.setTagData('tzo', '%+03d:%02d' % (tzo))
--
GitLab