Revision
4294
Author
cdaboo@apple.com
Date
2009-05-19 10:21:39 -0700 (Tue, 19 May 2009)

Log Message

Handle non-ascii data in directory records.

Modified Paths

Diff

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py (4293 => 4294)


--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-05-18 23:18:22 UTC (rev 4293)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-05-19 17:21:39 UTC (rev 4294)
@@ -693,6 +693,8 @@
                 self.log_error("Duplicate: %s" % (", ".join(record.shortNames)))
 
         if record:
+            if isinstance(origIndexKey, unicode):
+                origIndexKey = origIndexKey.encode("utf-8")
             self.log_debug("Storing (%s %s) %s in internal cache" % (indexType, origIndexKey, record))
 
             # Fetch the set of groups this record is a member of so we can