Revision
790
Author
cdaboo@apple.com
Date
2006-12-11 11:22:04 -0800 (Mon, 11 Dec 2006)

Log Message

Realm name must not be unicode as it gets copied into HTTP headers.

Modified Paths

Diff

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py (789 => 790)


--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2006-12-11 17:21:13 UTC (rev 789)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2006-12-11 19:22:04 UTC (rev 790)
@@ -81,7 +81,7 @@
         @param node: the L{Node} to parse.
         """
         if node.hasAttribute(ATTRIBUTE_REALM):
-            self.realm = node.getAttribute(ATTRIBUTE_REALM)
+            self.realm = node.getAttribute(ATTRIBUTE_REALM).encode("utf-8")
 
         def updateMembership(group):
             # Update group membership
@@ -189,7 +189,7 @@
         for child in node._get_childNodes():
             if child._get_localName() == ELEMENT_MEMBER:
                 if child.hasAttribute(ATTRIBUTE_RECORDTYPE):
-                    recordType = child.getAttribute(ATTRIBUTE_RECORDTYPE)
+                    recordType = child.getAttribute(ATTRIBUTE_RECORDTYPE).encode("utf-8")
                 else:
                     recordType = "user"
                 if child.firstChild is not None: