[CalendarServer-changes] [153] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 153
Author:   wsanchez at apple.com
Date:     2006-09-18 19:48:18 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
Update vObject to r155.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/vObject/base.patch
    CalendarServer/trunk/lib-patches/vObject/icalendar.patch
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/lib-patches/vObject/base.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vObject/base.patch	2006-09-19 02:44:05 UTC (rev 152)
+++ CalendarServer/trunk/lib-patches/vObject/base.patch	2006-09-19 02:48:18 UTC (rev 153)
@@ -1,6 +1,6 @@
 Index: src/vobject/base.py
 ===================================================================
---- src/vobject/base.py	(revision 147)
+--- src/vobject/base.py	(revision 155)
 +++ src/vobject/base.py	(working copy)
 @@ -1,5 +1,6 @@
  """vobject module for reading vCard and vCalendar files."""

Modified: CalendarServer/trunk/lib-patches/vObject/icalendar.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vObject/icalendar.patch	2006-09-19 02:44:05 UTC (rev 152)
+++ CalendarServer/trunk/lib-patches/vObject/icalendar.patch	2006-09-19 02:48:18 UTC (rev 153)
@@ -1,8 +1,8 @@
 Index: src/vobject/icalendar.py
 ===================================================================
---- src/vobject/icalendar.py	(revision 147)
+--- src/vobject/icalendar.py	(revision 155)
 +++ src/vobject/icalendar.py	(working copy)
-@@ -374,8 +374,17 @@
+@@ -377,8 +377,17 @@
                      try:
                          dtstart = self.dtstart.value
                      except AttributeError, KeyError:
@@ -22,16 +22,7 @@
                      # rrulestr complains about unicode, so cast to str
                      rule = dateutil.rrule.rrulestr(str(line.value),
                                                     dtstart=dtstart)
-@@ -380,7 +389,7 @@
-                     rule = dateutil.rrule.rrulestr(str(line.value),
-                                                    dtstart=dtstart)
-                     until = rule._until 
--                    if until is not None and until.tzinfo != dtstart.tzinfo:
-+                    if until is not None and isinstance(dtstart, datetime.datetime) and (until.tzinfo != dtstart.tzinfo):
-                         # dateutil converts the UNTIL date to a datetime,
-                         # check to see if the UNTIL parameter value was a date
-                         vals = dict(pair.split('=') for pair in
-@@ -417,7 +426,16 @@
+@@ -422,7 +431,16 @@
          return rruleset
  
      def setrruleset(self, rruleset):
@@ -49,7 +40,7 @@
          isDate = datetime.date == type(dtstart)
          if isDate:
              dtstart = datetime.datetime(dtstart.year,dtstart.month, dtstart.day)
-@@ -573,6 +591,8 @@
+@@ -580,6 +598,8 @@
          if obj.value.tzinfo is None:
              obj.params['X-VOBJ-FLOATINGTIME-ALLOWED'] = ['TRUE']
          if obj.params.get('TZID'):
@@ -58,7 +49,7 @@
              del obj.params['TZID']
          return obj
  
-@@ -585,6 +605,10 @@
+@@ -592,6 +612,10 @@
              obj.value = dateTimeToString(obj.value, cls.forceUTC)
              if not cls.forceUTC and tzid is not None:
                  obj.tzid_param = tzid
@@ -69,7 +60,7 @@
  
          return obj
  
-@@ -605,7 +629,10 @@
+@@ -612,7 +636,10 @@
          obj.value=str(obj.value)
          obj.value=parseDtstart(obj)
          if getattr(obj, 'value_param', 'DATE-TIME').upper() == 'DATE-TIME':

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2006-09-19 02:44:05 UTC (rev 152)
+++ CalendarServer/trunk/run	2006-09-19 02:48:18 UTC (rev 153)
@@ -460,7 +460,7 @@
       ;;
   esac;
   svn_uri="${base}/vobject/trunk";
-  svn_get "vObject" "${vobject}" "${svn_uri}" 147;
+  svn_get "vObject" "${vobject}" "${svn_uri}" 155;
 fi;
 py_install "vObject" "${vobject}";
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060918/931918f5/attachment.html