diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-18 23:59:50 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-18 23:59:51 +0100 |
| commit | d305dd73a3d6927f0a2c63d08662a183fa173833 (patch) | |
| tree | c13bf94c2fc99d90d498bf97078a6f00973053d3 | |
| parent | 85d586617750d38d742a24f141b099f6b898d269 (diff) | |
[utils] Fix js_to_json
Previously, the runtime could be atrocious for longer inputs.
| -rw-r--r-- | test/test_utils.py | 4 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 1c29d0889..c7373af1e 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -370,6 +370,10 @@ class TestUtil(unittest.TestCase): "playlist":[{"controls":{"all":null}}] }''') + inp = '"SAND Number: SAND 2013-7800P\\nPresenter: Tom Russo\\nHabanero Software Training - Xyce Software\\nXyce, Sandia\\u0027s"' + json_code = js_to_json(inp) + self.assertEqual(json.loads(json_code), json.loads(inp)) + 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"}) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 3eb6bc6d4..4358137a0 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1560,8 +1560,8 @@ def js_to_json(code): return '"%s"' % v res = re.sub(r'''(?x) - "(?:[^"\\]*(?:\\\\|\\")?)*"| - '(?:[^'\\]*(?:\\\\|\\')?)*'| + "(?:[^"\\]*(?:\\\\|\\['"nu]))*[^"\\]*"| + '(?:[^'\\]*(?:\\\\|\\['"nu]))*[^'\\]*'| [a-zA-Z_][.a-zA-Z_0-9]* ''', fix_kv, code) res = re.sub(r',(\s*\])', lambda m: m.group(1), res) |