# HG changeset patch # User Henry S. Thompson # Date 1696351499 -3600 # Node ID 83fbd652a0141d7950a910da03e6dd9fcff86a20 # Parent 170844e519874bb0d1c96abc3da919ef73aeb0ed iterate WPAT fix with improved pattern diff -r 170844e51987 -r 83fbd652a014 lib/python/cc/lmh/sort_date.py --- a/lib/python/cc/lmh/sort_date.py Tue Oct 03 17:43:52 2023 +0100 +++ b/lib/python/cc/lmh/sort_date.py Tue Oct 03 17:44:59 2023 +0100 @@ -16,7 +16,7 @@ import re, codecs from itertools import chain -WPAT = re.compile('(,www\\d*)+\\)') +WPAT = re.compile(r'(,www\d*)(:\d+)?\)') # Thanks to https://stackoverflow.com/a/8776871 import locale @@ -188,7 +188,9 @@ if '\\u' in uristring: uristring=bytes(uristring,'utf-8').decode('unicode_escape') _surt = surt.surt(uristring, canonicalizer=fixGoogleCanon) - return WPAT.sub(')',_surt) + while WPAT.search(_surt): + _surt = WPAT.sub(r'\2)',_surt) + return _surt def keyed(l): uri, cc_stamp, dateTime = l.split('\t',2)