ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-21 12:34:08 +00:00
Code Issues Projects Releases Wiki Activity

[utils] Allow JSONP with empty func name (closes #17028)

Browse Source
This commit is contained in:
Sergey M․ 2018-07-21 12:30:18 +07:00
parent fd62b36680
commit e9c671d5e8
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_utils.py
View File

@ -717,6 +717,10 @@ class TestUtil(unittest.TestCase):
d = json.loads(stripped) d = json.loads(stripped)
self.assertEqual(d, {'status': 'success'}) self.assertEqual(d, {'status': 'success'})
stripped = strip_jsonp('({"status": "success"});')
d = json.loads(stripped)
self.assertEqual(d, {'status': 'success'})
def test_uppercase_escape(self): def test_uppercase_escape(self):
self.assertEqual(uppercase_escape('aä'), 'aä') self.assertEqual(uppercase_escape('aä'), 'aä')
self.assertEqual(uppercase_escape('\\U0001d550'), '𝕐') self.assertEqual(uppercase_escape('\\U0001d550'), '𝕐')

2
youtube_dl/utils.py
View File

@ -2282,7 +2282,7 @@ def parse_age_limit(s):
def strip_jsonp(code): def strip_jsonp(code):
return re.sub( return re.sub(
r'''(?sx)^ r'''(?sx)^
(?:window\.)?(?P<func_name>[a-zA-Z0-9_.$]+) (?:window\.)?(?P<func_name>[a-zA-Z0-9_.$]*)
(?:\s*&&\s*(?P=func_name))? (?:\s*&&\s*(?P=func_name))?
\s*\(\s*(?P<callback_data>.*)\);? \s*\(\s*(?P<callback_data>.*)\);?
\s*?(?://[^\n]*)*$''', \s*?(?://[^\n]*)*$''',