[CalendarServer-changes] [4917] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 4917
          http://trac.macosforge.org/projects/calendarserver/changeset/4917
Author:   cdaboo at apple.com
Date:     2010-01-11 12:49:17 -0800 (Mon, 11 Jan 2010)
Log Message:
-----------
Update to latest vobject which includes some of our patches.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
    CalendarServer/trunk/support/build.sh

Removed Paths:
-------------
    CalendarServer/trunk/lib-patches/vobject/vobject.base.patch

Deleted: CalendarServer/trunk/lib-patches/vobject/vobject.base.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.base.patch	2010-01-11 20:48:15 UTC (rev 4916)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.base.patch	2010-01-11 20:49:17 UTC (rev 4917)
@@ -1,45 +0,0 @@
-Index: vobject/base.py
-===================================================================
---- vobject/base.py	(revision 212)
-+++ vobject/base.py	(working copy)
-@@ -284,6 +284,8 @@
-         self.value = copy.copy(copyit.value)
-         self.encoded = self.encoded
-         self.params = copy.copy(copyit.params)
-+        for k,v in self.params.items():
-+            self.params[k] = copy.copy(v)
-         self.singletonparams = copy.copy(copyit.singletonparams)
-         self.lineNumber = copyit.lineNumber
-         
-@@ -627,16 +629,16 @@
-         print
- 
- class VObjectError(Exception):
--    def __init__(self, message, lineNumber=None):
--        self.message = message
-+    def __init__(self, msg, lineNumber=None):
-+        self.msg = msg
-         if lineNumber is not None:
-             self.lineNumber = lineNumber
-     def __str__(self):
-         if hasattr(self, 'lineNumber'):
-             return "At line %s: %s" % \
--                   (self.lineNumber, self.message)
-+                   (self.lineNumber, self.msg)
-         else:
--            return repr(self.message)
-+            return repr(self.msg)
- 
- class ParseError(VObjectError):
-     pass
-@@ -953,7 +955,9 @@
-         if obj.group is not None:
-             s.write(obj.group + '.')
-         s.write(obj.name.upper())
--        for key, paramvals in obj.params.iteritems():
-+        keys = sorted(obj.params.iterkeys())
-+        for key in keys:
-+            paramvals = obj.params[key]
-             s.write(';' + key + '=' + ','.join(dquoteEscape(p) for p in paramvals))
-         s.write(':' + obj.value)
-         if obj.behavior and not startedEncoded: obj.behavior.decode(obj)

Modified: CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2010-01-11 20:48:15 UTC (rev 4916)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.icalendar.patch	2010-01-11 20:49:17 UTC (rev 4917)
@@ -1,36 +1,8 @@
 Index: vobject/icalendar.py
 ===================================================================
---- vobject/icalendar.py	(revision 212)
+--- vobject/icalendar.py	(revision 219)
 +++ vobject/icalendar.py	(working copy)
-@@ -426,6 +426,18 @@
- 
-                         if dtstart.tzinfo is not None:
-                             until = until.astimezone(dtstart.tzinfo)
-+                        
-+                        # RFC2445 actually states that UNTIL must be a UTC value. Whilst the
-+                        # changes above work OK, one problem case is if DTSTART is floating but
-+                        # UNTIL is properly specified as UTC (or with a TZID). In that case dateutil
-+                        # will fail datetime comparisons. There is no easy solution to this as
-+                        # there is no obvious timezone (at this point) to do proper floating time
-+                        # offset compisons. The best we can do is treat the UNTIL value as floating.
-+                        # This could mean incorrect determination of the last instance. The better
-+                        # solution here is to encourage clients to use COUNT rather than UNTIL
-+                        # when DTSTART is floating.
-+                        if dtstart.tzinfo is None:
-+                            until = until.replace(tzinfo=None)
- 
-                         rule._until = until
-                     
-@@ -473,7 +485,7 @@
-             untilSerialize = lambda x: dateTimeToString(x, True)
- 
-         for name in DATESANDRULES:
--            if hasattr(self.contents, name):
-+            if name in self.contents:
-                 del self.contents[name]
-             setlist = getattr(rruleset, '_' + name)
-             if name in DATENAMES:
-@@ -1661,9 +1673,10 @@
+@@ -1675,9 +1675,10 @@
                  else:
                      current.append(char)
              else:

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2010-01-11 20:48:15 UTC (rev 4916)
+++ CalendarServer/trunk/support/build.sh	2010-01-11 20:49:17 UTC (rev 4917)
@@ -493,7 +493,7 @@
   # XXX actually vObject should be imported in-place.
   py_dependency "vObject" "vobject" "vobject" \
     "svn" "${base}/vobject/trunk" \
-    false true true true 212;
+    false true true true 219;
 
   # Tool dependencies.  The code itself doesn't depend on these, but you probably want them.
   svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4912;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100111/fe85ca4e/attachment-0001.html>