# HG changeset patch # User Matti Hamalainen # Date 1468251617 -10800 # Node ID b08d159e35c7b32c0325b2e7b32d2c4456eb316b # Parent 1eefa9b5e945ec2a97cbc69ebcc06f01419ff837 Sanitize gcm_no_compare_fields[] diff -r 1eefa9b5e945 -r b08d159e35c7 multimerge.py --- a/multimerge.py Mon Jul 11 18:36:10 2016 +0300 +++ b/multimerge.py Mon Jul 11 18:40:17 2016 +0300 @@ -32,6 +32,11 @@ ### ### Misc. helper functions ### +gcm_no_compare_fields = [ + "id", "iCalUID", "etag", "sequence", "gcm_cal_id", + "created", "updated", "htmlLink", "organizer", +] + ## Wrapper for print() that does not break when redirecting stdin/out ## because of piped output not having a defined encoding. We default @@ -125,7 +130,6 @@ return None -gcm_no_compare_fields = [u"id", u"iCalUID", "etag", "sequence", "created", "htmlLink", "gcm_cal_id", "organizer", "updated"] def gcm_compare_events(ev1, ev2): for field in ev1: