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

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 22 07:19:15 PST 2012


Revision: 8755
          http://trac.macosforge.org/projects/calendarserver/changeset/8755
Author:   sagen at apple.com
Date:     2012-02-22 07:19:15 -0800 (Wed, 22 Feb 2012)
Log Message:
-----------
Also keep original CUA when it is in /path form, not just http(s)

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/test/test_icalendar.py

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2012-02-22 15:13:37 UTC (rev 8754)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2012-02-22 15:19:15 UTC (rev 8755)
@@ -2539,8 +2539,8 @@
                     oldemail = "mailto:%s" % (oldemail,)
 
                 if toUUID:
-                    # Store the original CUA if http(s):
-                    if cuaddr.startswith("http"):
+                    # Store the original CUA if http(s) or /path:
+                    if cuaddr.startswith("http") or cuaddr.startswith("/"):
                         prop.setParameter("CALENDARSERVER-OLD-CUA",
                             prop.value())
 

Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2012-02-22 15:13:37 UTC (rev 8754)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py	2012-02-22 15:19:15 UTC (rev 8755)
@@ -6038,8 +6038,8 @@
 
     def test_normalizeCalendarUserAddressesToUUID(self):
         """
-        Ensure http(s) CUA values are tucked away into the property using
-        CALENDARSERVER-OLD-CUA parameter.
+        Ensure http(s) and /path CUA values are tucked away into the property
+        using CALENDARSERVER-OLD-CUA parameter.
         """
 
         data = """BEGIN:VCALENDAR
@@ -6076,7 +6076,8 @@
         # /principal CUAs are not stored in CALENDARSERVER-OLD-CUA
         prop = component.getAttendeeProperty(("urn:uuid:foo",))
         self.assertEquals("urn:uuid:foo", prop.value())
-        self.assertEquals(prop.parameterValue("CALENDARSERVER-OLD-CUA"), None)
+        self.assertEquals(prop.parameterValue("CALENDARSERVER-OLD-CUA"),
+            "/principals/users/foo")
 
         # http CUAs are stored in CALENDARSERVER-OLD-CUA
         prop = component.getAttendeeProperty(("urn:uuid:buz",))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120222/20216d80/attachment.html>


More information about the calendarserver-changes mailing list