Revision: 1508 http://trac.macosforge.org/projects/calendarserver/changeset/1508 Author: cdaboo@apple.com Date: 2007-05-01 13:23:21 -0700 (Tue, 01 May 2007) Log Message: ----------- Fix bug where calendar-query report wityh recurrence expansion on a floating event would cause a 500 error. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/ical.py Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2007-05-01 20:20:55 UTC (rev 1507) +++ CalendarServer/trunk/twistedcaldav/ical.py 2007-05-01 20:23:21 UTC (rev 1508) @@ -632,9 +632,9 @@ if property.name() in ["RRULE", "RDATE", "EXRULE", "EXDATE", "RECURRENCE-ID"]: newcomp.removeProperty(property) - # Convert all datetime properties to UTC + # Convert all datetime properties to UTC unless they are floating for property in newcomp.properties(): - if isinstance(property.value(), datetime.datetime): + if isinstance(property.value(), datetime.datetime) and property.value().tzinfo is not None: property.setValue(property.value().astimezone(utc)) # Now reset DTSTART, DTEND/DURATION