[CalendarServer-changes] [5207] CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py

[source_changes at macosforge.org]

Revision: 5207
          http://trac.macosforge.org/projects/calendarserver/changeset/5207
Author:   wsanchez at apple.com
Date:     2010-02-24 20:28:26 -0800 (Wed, 24 Feb 2010)
Log Message:
-----------
Use iCalendarString()

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py

Modified: CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py	2010-02-25 04:27:28 UTC (rev 5206)
+++ CalendarServer/trunk/twistedcaldav/scheduling/icaldiff.py	2010-02-25 04:28:26 UTC (rev 5207)
@@ -18,8 +18,7 @@
 from twext.python.datetime import asUTC, iCalendarString
 
 from twistedcaldav.config import config
-from twistedcaldav.dateops import normalizeToUTC, toString,\
-    normalizeStartEndDuration
+from twistedcaldav.dateops import normalizeStartEndDuration
 from twistedcaldav.ical import Component, Property
 from twistedcaldav.scheduling.cuaddress import normalizeCUAddr
 from twistedcaldav.scheduling.itip import iTipGenerator
@@ -331,7 +330,7 @@
                     # Mark Attendee as DECLINED in the server instance
                     if self._attendeeDecline(self.newCalendar.overriddenComponent(rid)):
                         changeCausesReply = True
-                        changedRids.append(toString(rid) if rid else "")
+                        changedRids.append(iCalendarString(rid) if rid else "")
                 else:
                     # We used to generate a 403 here - but instead we now ignore this error and let the server data
                     # override the client
@@ -407,7 +406,7 @@
                 #return False, False, (), None
             changeCausesReply |= reply
             if reply:
-                changedRids.append(toString(rid) if rid else "")
+                changedRids.append(iCalendarString(rid) if rid else "")
 
         # We need to derive instances for any declined using an EXDATE
         for decline in sorted(declines):
@@ -418,7 +417,7 @@
                     self.newCalendar.addComponent(overridden)
                     if self._attendeeDecline(overridden):
                         changeCausesReply = True
-                        changedRids.append(toString(decline) if decline else "")
+                        changedRids.append(iCalendarString(decline) if decline else "")
                 else:
                     self._logDiffError("attendeeMerge: Unable to override an instance to mark as DECLINED: %s" % (decline,))
                     return False, False, (), None
@@ -540,7 +539,7 @@
             # Bad if EXDATEs have been removed
             missing = serverProps[-1] - clientProps[-1]
             if missing:
-                log.debug("EXDATEs missing: %s" % (", ".join([toString(exdate) for exdate in missing]),))
+                log.debug("EXDATEs missing: %s" % (", ".join([iCalendarString(exdate) for exdate in missing]),))
                 return False
             declines.extend(clientProps[-1] - serverProps[-1])
             return True
@@ -739,7 +738,7 @@
         
         if addedChanges:
             rid = comp1.getRecurrenceIDUTC()
-            rids[toString(rid) if rid is not None else ""] = propsChanged
+            rids[iCalendarString(rid) if rid is not None else ""] = propsChanged
 
     def _logDiffError(self, title):
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100224/3fd1af7f/attachment.html>