From: Jaime Marquínez Ferrándiz Date: Fri, 18 Mar 2016 18:18:55 +0000 (+0100) Subject: utils: lookup_unit_table: Use a stricter regex X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=09fc33198a4cfc93a98ce1ba7d51d41c487e5f56;p=youtube-dl.git utils: lookup_unit_table: Use a stricter regex In parse_count multiple units start with the same letter, so it would match different units depending on the order they were sorted when iterating over them. --- diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index ef6e7c7cb..bad1c4ea8 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1346,7 +1346,7 @@ def format_bytes(bytes): def lookup_unit_table(unit_table, s): units_re = '|'.join(re.escape(u) for u in unit_table) m = re.match( - r'(?P[0-9]+(?:[,.][0-9]*)?)\s*(?P%s)' % units_re, s) + r'(?P[0-9]+(?:[,.][0-9]*)?)\s*(?P%s)$' % units_re, s) if not m: return None num_str = m.group('num').replace(',', '.')