[CalendarServer-changes] [3043] CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/ instance.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Sep 24 09:54:00 PDT 2008


Revision: 3043
          http://trac.macosforge.org/projects/calendarserver/changeset/3043
Author:   wsanchez at apple.com
Date:     2008-09-24 09:54:00 -0700 (Wed, 24 Sep 2008)
Log Message:
-----------
Pull up EXDATE on DTSTART fix from r2994

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/instance.py

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/instance.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/instance.py	2008-09-24 16:50:41 UTC (rev 3042)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/instance.py	2008-09-24 16:54:00 UTC (rev 3043)
@@ -270,7 +270,14 @@
             # dateutils does not do all-day - so convert to datetime.datetime
             start = normalizeForIndex(start)
             end = normalizeForIndex(end)
-            self.addInstance(Instance(component, start, end))
+            
+            # Do not add if in EXDATEs
+            exdates = []
+            for prop in component.properties("EXDATE"):
+                exdates.extend(prop.value())
+            exdates = [normalizeForIndex(exdate) for exdate in exdates]
+            if start not in exdates:
+                self.addInstance(Instance(component, start, end))
         else:
             self.limit = limit
         
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080924/f92e2b2b/attachment.html 


More information about the calendarserver-changes mailing list