projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Correct octal/hexadecimal number detection in js_to_json
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 35362e7674205a62fd71ba347829a55e1f4f15a4..0c36c1b8028a8a3cf1128a213ee79b2cf0300482 100644
(file)
--- 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 = (
}.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:
)
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
return '"%d":' % i if v.endswith(':') else '%d' % i
return '"%s"' % v