[CalendarServer-changes] [7703] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jul 1 09:24:24 PDT 2011
Revision: 7703
http://trac.macosforge.org/projects/calendarserver/changeset/7703
Author: sagen at apple.com
Date: 2011-07-01 09:24:24 -0700 (Fri, 01 Jul 2011)
Log Message:
-----------
Handle missing CUTYPE (default is "INDIVIDUAL") during IMIP processing.
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-07-01 15:42:52 UTC (rev 7702)
+++ CalendarServer/trunk/twistedcaldav/mail.py 2011-07-01 16:24:24 UTC (rev 7703)
@@ -852,7 +852,7 @@
# readable email message (not modifying the calendar body)
attendees = []
for attendeeProp in calendar.getAllAttendeeProperties():
- cutype = attendeeProp.parameterValue('CUTYPE', None)
+ cutype = attendeeProp.parameterValue("CUTYPE", "INDIVIDUAL")
if cutype == "INDIVIDUAL":
cn = attendeeProp.parameterValue("CN", None).decode("utf-8")
cuaddr = normalizeCUAddr(attendeeProp.value())
Modified: CalendarServer/trunk/twistedcaldav/test/test_mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mail.py 2011-07-01 15:42:52 UTC (rev 7702)
+++ CalendarServer/trunk/twistedcaldav/test/test_mail.py 2011-07-01 16:24:24 UTC (rev 7703)
@@ -252,6 +252,7 @@
DTEND:20100325T164500Z
ATTENDEE;CN=Th\xe9 Attendee;CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=TRUE:mailto:attendee at example.com
ATTENDEE;CN=The Organizer;CUTYPE=INDIVIDUAL;EMAIL=organizer at example.com;PARTSTAT=ACCEPTED:urn:uuid:C3B38B00-4166-11DD-B22C-A07C87E02F6A
+ATTENDEE;CN=An Attendee without CUTYPE;EMAIL=nocutype at example.com;PARTSTAT=ACCEPTED:urn:uuid:4DB528DC-3E60-44FA-9546-2A00FCDCFFAB
ORGANIZER;CN=The Organizer;EMAIL=organizer at example.com:urn:uuid:C3B38B00-4166-11DD-B22C-A07C87E02F6A
SUMMARY:t\xe9sting outbound( )
END:VEVENT
@@ -265,7 +266,8 @@
"The Organizer",
[
(u'Th\xe9 Attendee', u'attendee at example.com'),
- (u'The Organizer', u'organizer at example.com')
+ (u'The Organizer', u'organizer at example.com'),
+ (u'An Attendee without CUTYPE', u'nocutype at example.com'),
],
"The Organizer <organizer at example.com>",
"attendee at example.com",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110701/f4ef3a61/attachment-0001.html>
More information about the calendarserver-changes
mailing list