[CalendarServer-changes] [2910] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 29 09:22:26 PDT 2008
Revision: 2910
http://trac.macosforge.org/projects/calendarserver/changeset/2910
Author: sagen at apple.com
Date: 2008-08-29 09:22:26 -0700 (Fri, 29 Aug 2008)
Log Message:
-----------
Upgrade to vobject 209 which now includes the REQUEST-STATUS patch; removing our local copy of patch
Modified Paths:
--------------
CalendarServer/trunk/run
Removed Paths:
-------------
CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
Deleted: CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch 2008-08-29 16:01:11 UTC (rev 2909)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch 2008-08-29 16:22:26 UTC (rev 2910)
@@ -1,60 +0,0 @@
-Index: vobject/icalendar.py
-===================================================================
---- vobject/icalendar.py (revision 208)
-+++ vobject/icalendar.py (working copy)
-@@ -777,22 +777,27 @@
- After transformation, value is a list of strings.
-
- """
-+ listSeparator = ","
-
-- @staticmethod
-- def decode(line):
-+ @classmethod
-+ def decode(cls, line):
- """Remove backslash escaping from line.value, then split on commas."""
- if line.encoded:
-- line.value = stringToTextValues(line.value)
-+ line.value = stringToTextValues(line.value,
-+ listSeparator=cls.listSeparator)
- line.encoded=False
-
-- @staticmethod
-- def encode(line):
-+ @classmethod
-+ def encode(cls, line):
- """Backslash escape line.value."""
- if not line.encoded:
-- line.value = ','.join(backslashEscape(val) for val in line.value)
-+ line.value = cls.listSeparator.join(backslashEscape(val) for val in line.value)
- line.encoded=True
-
-
-+class SemicolonMultiTextBehavior(MultiTextBehavior):
-+ listSeparator = ";"
-+
- #------------------------ Registered Behavior subclasses -----------------------
- class VCalendar2_0(VCalendarComponentBehavior):
- """vCalendar 2.0 behavior. With added VAVAILABILITY support."""
-@@ -804,6 +809,7 @@
- 'METHOD': (0, 1, None),
- 'VERSION': (0, 1, None),#required, but auto-generated
- 'PRODID': (1, 1, None),
-+ 'REQUEST-STATUS': (0, None, None),
- 'VTIMEZONE': (0, None, None),
- 'VEVENT': (0, None, None),
- 'VTODO': (0, None, None),
-@@ -1481,11 +1487,12 @@
-
- textList = ['CALSCALE', 'METHOD', 'PRODID', 'CLASS', 'COMMENT', 'DESCRIPTION',
- 'LOCATION', 'STATUS', 'SUMMARY', 'TRANSP', 'CONTACT', 'RELATED-TO',
-- 'UID', 'ACTION', 'REQUEST-STATUS', 'BUSYTYPE']
-+ 'UID', 'ACTION', 'BUSYTYPE']
- map(lambda x: registerBehavior(TextBehavior, x), textList)
-
- multiTextList = ['CATEGORIES', 'RESOURCES']
- map(lambda x: registerBehavior(MultiTextBehavior, x), multiTextList)
-+registerBehavior(SemicolonMultiTextBehavior, 'REQUEST-STATUS')
-
- #------------------------ Serializing helper functions -------------------------
-
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2008-08-29 16:01:11 UTC (rev 2909)
+++ CalendarServer/trunk/run 2008-08-29 16:22:26 UTC (rev 2910)
@@ -640,7 +640,7 @@
;;
esac;
svn_uri="${base}/vobject/trunk";
-svn_get "vObject" "${vobject}" "${svn_uri}" 208;
+svn_get "vObject" "${vobject}" "${svn_uri}" 209;
put_setuptools "${vobject}";
py_install "vObject" "${vobject}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080829/74def2dd/attachment.html
More information about the calendarserver-changes
mailing list