v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

[utils] Fixing runaway comments in js_to_json

Browse Source
This commit is contained in:
sulyi 2016-11-21 11:39:53 +01:00
parent d13093bed3
commit e6e9e1f45b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
youtube_dl/utils.py
View File

@ -2109,14 +2109,11 @@ def js_to_json(code):
return '"%s"' % v return '"%s"' % v
# fixing , followed nothing, but comments
# fixing unnecessary ? in /\*.*?\*/
# fixing greedy comment
return re.sub(r'''(?sx) return re.sub(r'''(?sx)
"(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"| "(?:[^"\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^"\\]*"|
'(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'| '(?:[^'\\]*(?:\\\\|\\['"nurtbfx/\n]))*[^'\\]*'|
,(?=(\s|(/\*((?!\*/)\n|.)*\*/))*[\]}])| ,(?=(\s|(/\*((?!\*/)(\n|.))*\*/))*[\]}])|
/\*((?!\*/)\n|.)*\*/|[a-zA-Z_][.a-zA-Z_0-9]*| /\*((?!\*/)(\n|.))*\*/|[a-zA-Z_][.a-zA-Z_0-9]*|
\b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:\s*:)?| \b(?:0[xX][0-9a-fA-F]+|0+[0-7]+)(?:\s*:)?|
[0-9]+(?=\s*:) [0-9]+(?=\s*:)
''', fix_kv, code) ''', fix_kv, code)