gitlab-com-dstftw/youtube-dl
1
0
Fork 0
mirror of https://gitlab.com/dstftw/youtube-dl.git synced 2020-11-16 09:42:26 +00:00
Code Issues Releases Wiki Activity

[utils:js_to_json] Fix bad escape in double quoted strings

Browse source
This commit is contained in:
Sergey M․ 2015-10-20 23:09:51 +06:00
parent 63a6494834
commit d01949dc89
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/test_utils.py
View file

@ -495,6 +495,9 @@ class TestUtil(unittest.TestCase):
"playlist":[{"controls":{"all":null}}] "playlist":[{"controls":{"all":null}}]
}''') }''')
inp = '''"The CW\\'s \\'Crazy Ex-Girlfriend\\'"'''
self.assertEqual(js_to_json(inp), '''"The CW's 'Crazy Ex-Girlfriend'"''')
inp = '"SAND Number: SAND 2013-7800P\\nPresenter: Tom Russo\\nHabanero Software Training - Xyce Software\\nXyce, Sandia\\u0027s"' inp = '"SAND Number: SAND 2013-7800P\\nPresenter: Tom Russo\\nHabanero Software Training - Xyce Software\\nXyce, Sandia\\u0027s"'
json_code = js_to_json(inp) json_code = js_to_json(inp)
self.assertEqual(json.loads(json_code), json.loads(inp)) self.assertEqual(json.loads(json_code), json.loads(inp))

4
youtube_dl/utils.py
View file

@ -1701,8 +1701,8 @@ def js_to_json(code):
if v in ('true', 'false', 'null'): if v in ('true', 'false', 'null'):
return v return v
if v.startswith('"'): if v.startswith('"'):
return v v = re.sub(r"\\'", "'", v[1:-1])
if v.startswith("'"): elif v.startswith("'"):
v = v[1:-1] v = v[1:-1]
v = re.sub(r"\\\\|\\'|\"", lambda m: { v = re.sub(r"\\\\|\\'|\"", lambda m: {
'\\\\': '\\\\', '\\\\': '\\\\',