Changeset 8699 for branches/gajim_0.11.1/src/common

Timestamp:

09/03/07 11:07:03 (15 months ago)

Author:

asterix

Message:

Handle malformed timestamps (which would cause an unhandled exception and hork the connection) and XEP-82 (dashes in timestamps).

Location:

branches/gajim_0.11.1/src/common

Files:

• connection_handlers.py (modified) (3 diffs)
• helpers.py (modified) (1 diff)
• zeroconf/connection_handlers_zeroconf.py (modified) (1 diff)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -25 +25 @@
 
 from time import (altzone, daylight, gmtime, localtime, mktime, strftime,
-                  strptime, time as time_time, timezone, tzname)
+                  time as time_time, timezone, tzname)
 from calendar import timegm
 
@@ -1386 +1386 @@
                 subject = msg.getSubject() # if not there, it's None
                 tim = msg.getTimestamp()
-                tim = strptime(tim, '%Y%m%dT%H:%M:%S')
+                tim = helpers.datetime_tuple(tim)
                 tim = localtime(timegm(tim))
                 frm = helpers.get_full_jid_from_iq(msg)
@@ -1586 +1586 @@
                                 # XEP-0091
                                 tim = prs.getTimestamp()
-                                tim = strptime(tim, '%Y%m%dT%H:%M:%S')
+                                tim = helpers.datetime_tuple(tim)
                                 timestamp = localtime(timegm(tim))
                         if namespace == 'http://delx.cjb.net/protocol/roster-subsync':

branches/gajim_0.11.1/src/common/helpers.py

@@ -947 +947 @@
                                 'show': status, 'message': message})
         return accounts
+
+def datetime_tuple(timestamp):
+        '''Converts timestamp using strptime and the format: %Y%m%dT%H:%M:%S
+        Because of various datetime formats are used the following exceptions
+        are handled:
+                - Optional milliseconds appened to the string are removed
+                - XEP-082 datetime strings have all '-' cahrs removed to meet
+                  the above format.'''
+        timestamp = timestamp.split('.')[0]
+        timestamp = timestamp.replace('-', '')
+        from time import strptime
+        return strptime(timestamp, '%Y%m%dT%H:%M:%S')

branches/gajim_0.11.1/src/common/zeroconf/connection_handlers_zeroconf.py

@@ -629 +629 @@
                 subject = msg.getSubject() # if not there, it's None
                 tim = msg.getTimestamp()
-                tim = time.strptime(tim, '%Y%m%dT%H:%M:%S')
+                tim = helpers.datetime_tuple(tim)
                 tim = time.localtime(timegm(tim))
                 frm = msg.getFrom()