logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: 8411229bd5e147ef1ac3420000c7c28ba660df2d
parent 72b9ebc65da3f1cb2f85d85b002674c8e5ae36ce
Author: Sergey M․ <dstftw@gmail.com>
Date:   Sun,  7 Feb 2016 19:47:09 +0600

[utils] Allow dot in strip_jsonp

Diffstat:

Mtest/test_utils.py4++++
Myoutube_dl/utils.py2+-
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/test_utils.py b/test/test_utils.py @@ -494,6 +494,10 @@ class TestUtil(unittest.TestCase): d = json.loads(stripped) self.assertEqual(d, {'STATUS': 'OK'}) + stripped = strip_jsonp('ps.embedHandler({"status": "success"});') + d = json.loads(stripped) + self.assertEqual(d, {'status': 'success'}) + def test_uppercase_escape(self): self.assertEqual(uppercase_escape('aä'), 'aä') self.assertEqual(uppercase_escape('\\U0001d550'), '𝕐') diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py @@ -1749,7 +1749,7 @@ def parse_age_limit(s): def strip_jsonp(code): return re.sub( - r'(?s)^[a-zA-Z0-9_]+\s*\(\s*(.*)\);?\s*?(?://[^\n]*)*$', r'\1', code) + r'(?s)^[a-zA-Z0-9_.]+\s*\(\s*(.*)\);?\s*?(?://[^\n]*)*$', r'\1', code) def js_to_json(code):