[CalendarServer-changes] [7159] CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav /directory/principal.py

[source_changes at macosforge.org]

Revision: 7159
          http://trac.macosforge.org/projects/calendarserver/changeset/7159
Author:   sagen at apple.com
Date:     2011-03-08 17:20:41 -0800 (Tue, 08 Mar 2011)
Log Message:
-----------
Backport CalendarUserProxyPrincipalResource unicode proxyType fix

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/principal.py	2011-03-09 01:15:26 UTC (rev 7158)
+++ CalendarServer/branches/release/CalendarServer-2.5-dev/twistedcaldav/directory/principal.py	2011-03-09 01:20:41 UTC (rev 7159)
@@ -950,7 +950,8 @@
             return self
 
         if config.EnableProxyPrincipals and name in ("calendar-proxy-read", "calendar-proxy-write"):
-            return CalendarUserProxyPrincipalResource(self, name)
+            # name is required to be str
+            return CalendarUserProxyPrincipalResource(self, str(name))
         else:
             return None
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110308/dd9f0467/attachment.html>