[utils] Fix js_to_json

This commit is contained in:
Philipp Hagemeister 2014-09-30 07:56:24 +02:00
parent 07e764439a
commit 410f3e73ab
2 changed files with 15 additions and 1 deletions

View File

@ -44,6 +44,7 @@
limit_length, limit_length,
escape_rfc3986, escape_rfc3986,
escape_url, escape_url,
js_to_json,
) )
@ -331,5 +332,14 @@ def test_escape_url(self):
) )
self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0') self.assertEqual(escape_url('http://vimeo.com/56015672#at=0'), 'http://vimeo.com/56015672#at=0')
def test_js_to_json(self):
inp = '''{
'clip':{'provider':'pseudo'}
}'''
self.assertEqual(js_to_json(inp), '''{
"clip":{"provider":"pseudo"}
}''')
json.loads(js_to_json(inp))
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

View File

@ -673,6 +673,8 @@ def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None):
expected = True expected = True
if video_id is not None: if video_id is not None:
msg = video_id + ': ' + msg msg = video_id + ': ' + msg
if cause:
msg += u' (caused by %r)' % cause
if not expected: if not expected:
msg = msg + u'; please report this issue on https://yt-dl.org/bug . Be sure to call youtube-dl with the --verbose flag and include its complete output. Make sure you are using the latest version; type youtube-dl -U to update.' msg = msg + u'; please report this issue on https://yt-dl.org/bug . Be sure to call youtube-dl with the --verbose flag and include its complete output. Make sure you are using the latest version; type youtube-dl -U to update.'
super(ExtractorError, self).__init__(msg) super(ExtractorError, self).__init__(msg)
@ -1598,7 +1600,9 @@ def fix_kv(m):
([{,]\s*) ([{,]\s*)
("[^"]*"|\'[^\']*\'|[a-z0-9A-Z]+) ("[^"]*"|\'[^\']*\'|[a-z0-9A-Z]+)
(:\s*) (:\s*)
([0-9.]+|true|false|"[^"]*"|\'[^\']*\'|\[|\{) ([0-9.]+|true|false|"[^"]*"|\'[^\']*\'|
(?=\[|\{)
)
''', fix_kv, code) ''', fix_kv, code)
res = re.sub(r',(\s*\])', lambda m: m.group(1), res) res = re.sub(r',(\s*\])', lambda m: m.group(1), res)
return res return res