[CalendarServer-changes] [8294] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 8294
          http://trac.macosforge.org/projects/calendarserver/changeset/8294
Author:   sagen at apple.com
Date:     2011-11-16 10:42:55 -0800 (Wed, 16 Nov 2011)
Log Message:
-----------
Always convert token to str so that we don't get unicode decode errors later on.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/test/test_mail.py

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2011-11-16 17:49:34 UTC (rev 8293)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2011-11-16 18:42:55 UTC (rev 8294)
@@ -707,7 +707,9 @@
                 update TOKENS set DATESTAMP = :1 WHERE TOKEN = :2
                 """, datetime.date.today(), token
             )
-        return token
+            return str(token)
+        else:
+            return None
 
     def deleteToken(self, token):
         self._db_execute(

Modified: CalendarServer/trunk/twistedcaldav/test/test_mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mail.py	2011-11-16 17:49:34 UTC (rev 8293)
+++ CalendarServer/trunk/twistedcaldav/test/test_mail.py	2011-11-16 18:42:55 UTC (rev 8294)
@@ -159,6 +159,7 @@
         self.handler.lowercase()
         retrieved = self.handler.db.getToken(organizer.lower(),
             attendee.lower(), icaluid)
+        self.assertTrue(isinstance(retrieved, str))
         self.assertEquals(retrieved, token)
 
         # Insert a token with (new-format) urn:uuid:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111116/17000b16/attachment.html>