From: Sergey M․ Date: Sat, 14 May 2016 17:41:57 +0000 (+0600) Subject: [utils] Simplify integer conversion in js_to_json X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cda6d47aad106a825f837c7a583fffc783c4b63b;p=youtube-dl [utils] Simplify integer conversion in js_to_json --- diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 25a9f33c0..a637563cb 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1926,14 +1926,14 @@ def js_to_json(code): }.get(m.group(0), m.group(0)), v[1:-1]) INTEGER_TABLE = ( - (r'^(0[xX][0-9a-fA-F]+)', 16), - (r'^(0+[0-7]+)', 8), + (r'^0[xX][0-9a-fA-F]+', 16), + (r'^0+[0-7]+', 8), ) for regex, base in INTEGER_TABLE: im = re.match(regex, v) if im: - i = int(im.group(1), base) + i = int(im.group(0), base) return '"%d":' % i if v.endswith(':') else '%d' % i return '"%s"' % v