[CalendarServer-changes] [4359] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jun 18 09:47:35 PDT 2009
Revision: 4359
http://trac.macosforge.org/projects/calendarserver/changeset/4359
Author: cdaboo at apple.com
Date: 2009-06-18 09:47:34 -0700 (Thu, 18 Jun 2009)
Log Message:
-----------
X-CALENDARSERVER-EMAIL -> EMAIL.
Modified Paths:
--------------
CalendarServer/trunk/run
CalendarServer/trunk/twistedcaldav/ical.py
CalendarServer/trunk/twistedcaldav/resource.py
CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2009-06-18 16:32:30 UTC (rev 4358)
+++ CalendarServer/trunk/run 2009-06-18 16:47:34 UTC (rev 4359)
@@ -727,7 +727,7 @@
caldavtester="${top}/CalDAVTester";
-svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4350;
+svn_get "CalDAVTester" "${caldavtester}" "${svn_uri_base}/CalDAVTester/trunk" 4358;
#
# PyFlakes
Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py 2009-06-18 16:32:30 UTC (rev 4358)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2009-06-18 16:47:34 UTC (rev 4359)
@@ -2089,10 +2089,9 @@
except KeyError:
pass
- # Re-write the X-CALENDARSERVER-EMAIL if its value no longer
+ # Re-write the EMAIL if its value no longer
# matches
- oldemail = prop.params().get("X-CALENDARSERVER-EMAIL",
- (None,))[0]
+ oldemail = prop.params().get("EMAIL", (None,))[0]
if oldemail:
oldemail = "mailto:%s" % (oldemail,)
if oldemail is None or oldemail not in cuaddrs:
@@ -2107,10 +2106,10 @@
email = None
if email:
- prop.params()["X-CALENDARSERVER-EMAIL"] = [email,]
+ prop.params()["EMAIL"] = [email,]
else:
try:
- del prop.params()["X-CALENDARSERVER-EMAIL"]
+ del prop.params()["EMAIL"]
except KeyError:
pass
Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py 2009-06-18 16:32:30 UTC (rev 4358)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2009-06-18 16:47:34 UTC (rev 4359)
@@ -661,7 +661,7 @@
def iCalendarAddressDoNormalization(self, ical):
"""
Normalize calendar user addresses in the supplied iCalendar object into their
- urn:uuid form where possible. Also reset CN= property and add X-CALENDARSERVER-EMAIL property.
+ urn:uuid form where possible. Also reset CN= property and add EMAIL property.
@param ical: calendar object to normalize.
@type ical: L{Component}
Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2009-06-18 16:32:30 UTC (rev 4358)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2009-06-18 16:47:34 UTC (rev 4359)
@@ -24,7 +24,7 @@
from calendarserver.tools.util import getDirectory
from twisted.web2.dav import davxml
-
+import hashlib
import os, zlib, cPickle
freeBusyAttr = "WebDAV:{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"
@@ -303,7 +303,7 @@
"@contents" : event01_after,
"@xattrs" :
{
- md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>967eac8e6cc69b43fb820e8cf438d8e7</getcontentmd5>\r\n"),
+ md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>\r\n" % (event01_after_md5,)),
},
},
"@xattrs" :
@@ -546,7 +546,7 @@
"@contents" : event01_after,
"@xattrs" :
{
- md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>967eac8e6cc69b43fb820e8cf438d8e7</getcontentmd5>\r\n"),
+ md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>\r\n" % (event01_after_md5,)),
},
},
"@xattrs" :
@@ -621,7 +621,7 @@
"@contents" : event01_after,
"@xattrs" :
{
- md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>967eac8e6cc69b43fb820e8cf438d8e7</getcontentmd5>\r\n"),
+ md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>\r\n" % (event01_after_md5,)),
},
},
"@xattrs" :
@@ -671,7 +671,7 @@
"@contents" : event01_after,
"@xattrs" :
{
- md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>967eac8e6cc69b43fb820e8cf438d8e7</getcontentmd5>\r\n"),
+ md5Attr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<getcontentmd5 xmlns='http://twistedmatrix.com/xml_namespace/dav/'>%s</getcontentmd5>\r\n" % (event01_after_md5,)),
},
},
"@xattrs" :
@@ -946,17 +946,16 @@
UID:1E238CA1-3C95-4468-B8CD-C8A399F78C71
DTSTART;TZID=US/Pacific:20090203T120000
DTEND;TZID=US/Pacific:20090203T130000
-ATTENDEE;CN=Wilfredo Sanchez;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED;X-CALENDA
- RSERVER-EMAIL=wsanchez at example.com:urn:uuid:6423F94A-6B76-4A3A-815B-D52CFD
- 77935D
-ATTENDEE;CN=Cyrus Daboo;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED;ROLE=REQ-PARTI
- CIPANT;X-CALENDARSERVER-EMAIL=cdaboo at example.com:urn:uuid:5A985493-EE2C-46
- 65-94CF-4DFEA3A89500
+ATTENDEE;CN=Wilfredo Sanchez;CUTYPE=INDIVIDUAL;EMAIL=wsanchez at example.com;
+ PARTSTAT=ACCEPTED:urn:uuid:6423F94A-6B76-4A3A-815B-D52CFD77935D
+ATTENDEE;CN=Cyrus Daboo;CUTYPE=INDIVIDUAL;EMAIL=cdaboo at example.com;PARTSTA
+ T=ACCEPTED;ROLE=REQ-PARTICIPANT:urn:uuid:5A985493-EE2C-4665-94CF-4DFEA3A89
+ 500
CREATED:20090203T181910Z
DESCRIPTION:This has " Bad Quotes " in it
DTSTAMP:20090203T181924Z
-ORGANIZER;CN=Cyrus Daboo;X-CALENDARSERVER-EMAIL=cdaboo at example.com:urn:uui
- d:5A985493-EE2C-4665-94CF-4DFEA3A89500
+ORGANIZER;CN=Cyrus Daboo;EMAIL=cdaboo at example.com:urn:uuid:5A985493-EE2C-4
+ 665-94CF-4DFEA3A89500
SEQUENCE:2
SUMMARY:New Event
TRANSP:OPAQUE
@@ -966,6 +965,8 @@
event02_broken = "Invalid!"
+event01_after_md5 = hashlib.md5(event01_after).hexdigest()
+
def isValidCTag(value):
"""
Since ctag is generated from datetime.now(), let's make sure that at
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090618/b58ea60e/attachment.html>
More information about the calendarserver-changes
mailing list