github/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-08-23 06:35:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b919bd0413 into 195f22f679

Browse source
This commit is contained in:
Fyssion 2022-11-13 21:50:31 +05:30 • committed by GitHub
commit 2e80b6d5d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/test_utils.py
View file

@ -70,6 +70,7 @@ from youtube_dl.utils import (
sanitize_filename, sanitize_filename,
sanitize_path, sanitize_path,
sanitize_url, sanitize_url,
sanitized_Request,
expand_path, expand_path,
prepend_extension, prepend_extension,
replace_extension, replace_extension,
@ -250,6 +251,11 @@ class TestUtil(unittest.TestCase):
self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar') self.assertEqual(sanitize_url('httpss://foo.bar'), 'https://foo.bar')
self.assertEqual(sanitize_url('rmtps://foo.bar'), 'rtmps://foo.bar') self.assertEqual(sanitize_url('rmtps://foo.bar'), 'rtmps://foo.bar')
self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar') self.assertEqual(sanitize_url('https://foo.bar'), 'https://foo.bar')
self.assertEqual(sanitize_url('ytsearch:search query'), 'ytsearch:search query')
def test_sanitized_Request(self):
# issue 31008
self.assertEqual(sanitized_Request('https://foo.bar/foo bar').get_full_url(), 'https://foo.bar/foo%20bar')
def test_expand_path(self): def test_expand_path(self):
def env(var): def env(var):

4
youtube_dl/utils.py
View file

@ -2175,11 +2175,11 @@ def sanitize_url(url):
for mistake, fixup in COMMON_TYPOS: for mistake, fixup in COMMON_TYPOS:
if re.match(mistake, url): if re.match(mistake, url):
return re.sub(mistake, fixup, url) return re.sub(mistake, fixup, url)
return escape_url(url) return url
def sanitized_Request(url, *args, **kwargs): def sanitized_Request(url, *args, **kwargs):
return compat_urllib_request.Request(sanitize_url(url), *args, **kwargs) return compat_urllib_request.Request(escape_url(sanitize_url(url)), *args, **kwargs)
def expand_path(s): def expand_path(s):