[utils] Fixing js_to_json

2016-11-20 22:53:48 +01:00 · 2016-11-20 22:53:48 +01:00 · 9a2ef3f7fd
commit 9a2ef3f7fd
parent 58355a3bf1
1 changed files with 4 additions and 1 deletions
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@ -2109,10 +2109,13 @@ def js_to_json(code):

        return '"%s"' % v

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