Strip the DTSTAMP value from ical before comparing them (#520)

 Fixes #380

#520

Author: tobixen

caldav/davclient.py

@@ -563,14 +563,22 @@ def principals(self, name=None):
         ## TODO: allow server side filtering.  We need a  <D:property-search><D:prop><D:displayname/></D:prop><D:match>{name}</D:match></D:property-search> inside the PrincipalPropertySearch
 
         if name:
-            name_filter = [ dav.PropertySearch() + [dav.Prop() + [dav.DisplayName()]] + dav.Match(value=name)]
-            import pdb; pdb.set_trace()
+            name_filter = [
+                dav.PropertySearch()
+                + [dav.Prop() + [dav.DisplayName()]]
+                + dav.Match(value=name)
+            ]
+            import pdb
+
+            pdb.set_trace()
         else:
             name_filter = []
 
-        query = dav.PrincipalPropertySearch() + name_filter + [
-            dav.Prop() + cdav.CalendarHomeSet() + dav.DisplayName()
-        ]
+        query = (
+            dav.PrincipalPropertySearch()
+            + name_filter
+            + [dav.Prop() + cdav.CalendarHomeSet() + dav.DisplayName()]
+        )
         response = self.report(self.url, etree.tostring(query.xmlelement()))
         principal_dict = response.find_objects_and_props()
         ret = []

caldav/elements/dav.py

@@ -30,11 +30,14 @@ class PrincipalPropertySearch(BaseElement):
 class PropertySearch(BaseElement):
     tag: ClassVar[str] = ns("D", "property-search")
 
+
 # Filters
 
+
 class Match(BaseElement):
     tag: ClassVar[str] = ns("D", "match")
 
+
 # Conditions
 class SyncToken(BaseElement):
     tag: ClassVar[str] = ns("D", "sync-token")

tests/test_vcal.py

@@ -40,10 +40,17 @@ def assertSameICal(self, ical1, ical2, ignore_uid=False):
         """helper method"""
 
         def normalize(s, ignore_uid):
+            ## TODO: This may break in case of line wrappings
+            ## We're explicitly not using any libraries for this, as it may skew the test
             s = to_wire(s).replace(b"\r\n", b"\n").strip().split(b"\n")
             s.sort()
             if ignore_uid:
                 s = [x for x in s if not x.startswith(b"UID:")]
+            ## ref https://github.com/python-caldav/caldav/issues/380
+            for i in range(0, len(s)):
+                ## We cut the value itself, just asserting the attribute is present
+                if s[i].startswith(b"DTSTAMP"):
+                    s[i] = s[i][:9]
             return b"\n".join(s)
 
         self.assertEqual(normalize(ical1, ignore_uid), normalize(ical2, ignore_uid))