aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-08-19 20:37:17 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-08-19 20:37:17 +0800
commite4659b45474acb563db0ab4284abdfc80837307e (patch)
treed0123c1cc00ea98d40f387c74cb3cd6fcc83cc38 /youtube_dl
parent9e5751b9fe72f7425e4cb3f22a56b6a95b59e41d (diff)
[utils] Correct octal/hexadecimal number detection in js_to_json
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 35362e767..0c36c1b80 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2038,14 +2038,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]+)\s*:?$', 16),
+ (r'^(0+[0-7]+)\s*:?$', 8),
)
for regex, base in INTEGER_TABLE:
im = re.match(regex, v)
if im:
- i = int(im.group(0), base)
+ i = int(im.group(1), base)
return '"%d":' % i if v.endswith(':') else '%d' % i
return '"%s"' % v