[CalendarServer-changes] [5603] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 14 13:18:04 PDT 2010
Revision: 5603
http://trac.macosforge.org/projects/calendarserver/changeset/5603
Author: cdaboo at apple.com
Date: 2010-05-14 13:18:02 -0700 (Fri, 14 May 2010)
Log Message:
-----------
Make sure properties returned as None from readProperty are returned as 404 propstatus.
Modified Paths:
--------------
CalendarServer/trunk/twext/web2/dav/method/propfind.py
CalendarServer/trunk/twistedcaldav/method/propfind.py
CalendarServer/trunk/twistedcaldav/method/report_common.py
Modified: CalendarServer/trunk/twext/web2/dav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twext/web2/dav/method/propfind.py 2010-05-14 20:16:51 UTC (rev 5602)
+++ CalendarServer/trunk/twext/web2/dav/method/propfind.py 2010-05-14 20:18:02 UTC (rev 5603)
@@ -173,7 +173,10 @@
properties_by_status[status] = []
properties_by_status[status].append(propertyName(property))
else:
- properties_by_status[responsecode.OK].append(resource_property)
+ if resource_property is not None:
+ properties_by_status[responsecode.OK].append(resource_property)
+ else:
+ properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
else:
properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
Modified: CalendarServer/trunk/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/propfind.py 2010-05-14 20:16:51 UTC (rev 5602)
+++ CalendarServer/trunk/twistedcaldav/method/propfind.py 2010-05-14 20:18:02 UTC (rev 5603)
@@ -163,7 +163,10 @@
properties_by_status[status] = []
properties_by_status[status].append(propertyName(property))
else:
- properties_by_status[responsecode.OK].append(resource_property)
+ if resource_property is not None:
+ properties_by_status[responsecode.OK].append(resource_property)
+ else:
+ properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
else:
properties_by_status[responsecode.NOT_FOUND].append(propertyName(property))
Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2010-05-14 20:16:51 UTC (rev 5602)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2010-05-14 20:18:02 UTC (rev 5603)
@@ -371,7 +371,10 @@
if has:
try:
prop = (yield resource.readProperty(qname, request))
- properties_by_status[responsecode.OK].append(prop)
+ if prop is not None:
+ properties_by_status[responsecode.OK].append(prop)
+ else:
+ properties_by_status[responsecode.NOT_FOUND].append(propertyName(qname))
except HTTPError:
f = Failure()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100514/a0699390/attachment.html>
More information about the calendarserver-changes
mailing list