Browse Source
[utils] Simplify integer conversion in js_to_json
master
Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with
3 additions and
3 deletions
-
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 |
|
|
|
|
