Merge branch 'utils' into sulyi

test/test_utils.py

@@ -743,6 +743,26 @@ class TestUtil(unittest.TestCase):
         inp = '''{"duration": "00:01:07"}'''
         self.assertEqual(js_to_json(inp), '''{"duration": "00:01:07"}''')
 
+    def test_js_to_json_landofoz(self):
+        inp = '''{
+            character: {
+                name: "Dorothy",
+                pet: "Toto",
+                /*   source: "Kansas",
+                destination:  "Emerald City",
+                roll: "heroine" */
+            },
+            comment: /* over the rainbow */ "/*",
+            no_comment: "*/"
+        }'''
+        self.assertEqual(js_to_json(inp), '''{
+            "character": {
+                "name": "Dorothy",
+                "pet": "Toto"\n                \n            },
+            "comment":  "/*",
+            "no_comment": "*/"
+        }''')
+
     def test_js_to_json_edgecases(self):
         on = js_to_json("{abc_def:'1\\'\\\\2\\\\\\'3\"4'}")
         self.assertEqual(json.loads(on), {"abc_def": "1'\\2\\'3\"4"})

youtube_dl/utils.py

@@ -2109,14 +2109,11 @@ 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|(/\*((?!\*/)\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*:)?|
         [0-9]+(?=\s*:)
         ''', fix_kv, code)