Fix bug introduced by the previous patch by changing TimeRE.__seqToRe() to
accept any iterable instead of only a sliceable object.
This commit is contained in:
parent
c5fa992069
commit
ffa5cf9eae
|
@ -226,13 +226,12 @@ class TimeRE(dict):
|
||||||
matching when 'abcdef' should have been the match).
|
matching when 'abcdef' should have been the match).
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
to_convert = sorted(to_convert, key=len, reverse=True)
|
||||||
for value in to_convert:
|
for value in to_convert:
|
||||||
if value != '':
|
if value != '':
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
return ''
|
return ''
|
||||||
to_convert = to_convert[:]
|
|
||||||
to_convert.sort(key=len, reverse=True)
|
|
||||||
regex = '|'.join(re_escape(stuff) for stuff in to_convert)
|
regex = '|'.join(re_escape(stuff) for stuff in to_convert)
|
||||||
regex = '(?P<%s>%s' % (directive, regex)
|
regex = '(?P<%s>%s' % (directive, regex)
|
||||||
return '%s)' % regex
|
return '%s)' % regex
|
||||||
|
|
Loading…
Reference in New Issue