[CalendarServer-changes] [5599] CalendarServer/branches/users/cdaboo/more-sharing-5591

source_changes at macosforge.org source_changes at macosforge.org
Fri May 14 09:12:29 PDT 2010


Revision: 5599
          http://trac.macosforge.org/projects/calendarserver/changeset/5599
Author:   cdaboo at apple.com
Date:     2010-05-14 09:12:27 -0700 (Fri, 14 May 2010)
Log Message:
-----------
Properties returned as None by readProperty should be reported as a 404 propstatus.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/more-sharing-5591/twext/web2/dav/method/propfind.py
    CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/propfind.py
    CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/report_common.py

Modified: CalendarServer/branches/users/cdaboo/more-sharing-5591/twext/web2/dav/method/propfind.py
===================================================================
--- CalendarServer/branches/users/cdaboo/more-sharing-5591/twext/web2/dav/method/propfind.py	2010-05-13 21:18:06 UTC (rev 5598)
+++ CalendarServer/branches/users/cdaboo/more-sharing-5591/twext/web2/dav/method/propfind.py	2010-05-14 16:12:27 UTC (rev 5599)
@@ -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/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/propfind.py
===================================================================
--- CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/propfind.py	2010-05-13 21:18:06 UTC (rev 5598)
+++ CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/propfind.py	2010-05-14 16:12:27 UTC (rev 5599)
@@ -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/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/report_common.py	2010-05-13 21:18:06 UTC (rev 5598)
+++ CalendarServer/branches/users/cdaboo/more-sharing-5591/twistedcaldav/method/report_common.py	2010-05-14 16:12:27 UTC (rev 5599)
@@ -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/a0f92c81/attachment.html>


More information about the calendarserver-changes mailing list