# HG changeset patch # User Matti Hamalainen # Date 1467730859 -10800 # Node ID cc30383f5f0d87a20a3bc2406ae5dde56d6a2622 # Parent 1ce5ccd949b6687b052616b3b9f00b633d1f25c4 More Unicode fixes. diff -r 1ce5ccd949b6 -r cc30383f5f0d multimerge.py --- a/multimerge.py Tue Jul 05 17:55:30 2016 +0300 +++ b/multimerge.py Tue Jul 05 18:00:59 2016 +0300 @@ -256,9 +256,9 @@ cfg.mdef("email", True, cfg.is_bool, cfg.trans_bool, False) cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None) cfg.mdef("email_sender", True, cfg.is_email, None, None) -cfg.mdef("email_subject", True, cfg.is_string, None, "Google Calendar MultiMerge status") +cfg.mdef("email_subject", True, cfg.is_string, None, u"Google Calendar MultiMerge status") -cfg.mdef("source_regex", True, cfg.is_string, None, "^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") +cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) @@ -359,7 +359,7 @@ ## Filter desired SOURCE calendars based on specified regexp -src_re = re.compile(cfg.source_regex) +src_re = re.compile(cfg.source_regex, re.UNICODE) src_calendars = [] for calendar in calendars: if "summary" in calendar: