1
0
mirror of https://github.com/l1ving/youtube-dl synced 2025-02-03 17:32:51 +08:00

Merge branch 'sulyi' into youwatch

This commit is contained in:
sulyi 2016-11-21 07:27:23 +01:00
commit 99d6f48bde

View File

@ -2115,8 +2115,8 @@ def js_to_json(code):
return re.sub(r'''(?sx)
"(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"|
'(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'|
/\*[^*]*\*/|,(?=(\s|(/\*[^*]*\*/))*[\]}])|
[a-zA-Z_][.a-zA-Z_0-9]*|
,(?=(\s|(/\*((?!\*/)\n|.)*\*/))*[\]}])|
/\*((?!\*/)\n|.)*\*/|[a-zA-Z_][.a-zA-Z_0-9]*|
\b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:\s*:)?|
[0-9]+(?=\s*:)
''', fix_kv, code)