fix for issue #495

Author: tobixen

caldav/calendarobjectresource.py

@@ -1329,8 +1329,6 @@ def complete(
         self.save()
 
     def _complete_ical(self, i=None, completion_timestamp=None) -> None:
-        ## my idea was to let self.complete call this one ... but self.complete
-        ## should use vobject and not icalendar library due to backward compatibility.
         if i is None:
             i = self.icalendar_component
         assert self._is_pending(i)

caldav/collection.py

@@ -850,11 +850,7 @@ def search(
                     ## and still, Zimbra seems to deliver too many TODOs in the
                     ## matches2 ... let's do some post-filtering in case the
                     ## server fails in filtering things the right way
-                    if "STATUS:NEEDS-ACTION" in item.data or (
-                        "\nCOMPLETED:" not in item.data
-                        and "\nSTATUS:COMPLETED" not in item.data
-                        and "\nSTATUS:CANCELLED" not in item.data
-                    ):
+                    if any(x.get('STATUS') not in ('COMPLETED', 'CANCELLED') for x in item.icalendar_instance.subcomponents):
                         objects.append(item)
         else:
             if not xml: