Revision
1551
Author
cdaboo@apple.com
Date
2007-05-22 13:13:58 -0700 (Tue, 22 May 2007)

Log Message

Handle invalid calendar data errors from dateutil to generate a proper HTTP error.

Modified Paths

Diff

Modified: CalendarServer/trunk/twistedcaldav/method/put_common.py (1550 => 1551)


--- CalendarServer/trunk/twistedcaldav/method/put_common.py	2007-05-22 19:11:59 UTC (rev 1550)
+++ CalendarServer/trunk/twistedcaldav/method/put_common.py	2007-05-22 20:13:58 UTC (rev 1551)
@@ -472,8 +472,8 @@
                     responsecode.FORBIDDEN,
                     NumberOfRecurrencesWithinLimits(PCDATAElement(str(ex.max_allowed)))
                 ))
-            except ValueError, e:
-                log.err(str(e))
+            except (ValueError, TypeError), ex:
+                log.err("Cannot index calendar resource: %s" % (ex,))
                 raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "valid-calendar-data")))
 
             destination.writeDeadProperty(davxml.GETContentType.fromString("text/calendar"))