pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-23 04:30:10 +09:00
Code Issues Projects Releases Wiki Activity

[utils] Check for None values in SOCKS proxy

Browse Source 
Originally reported at
https://github.com/rg3/youtube-dl/pull/9287#issuecomment-219617864
This commit is contained in:
Yen Chi Hsuan 2016-05-17 14:38:15 +08:00
parent 36755d9d69
commit cdd94c2eae
No known key found for this signature in database
GPG Key ID: 3FDDD575826C5C30
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/utils.py
View File

@ -883,12 +883,17 @@ def make_socks_conn_class(base_class, socks_proxy):
elif url_components.scheme.lower() == 'socks4a': elif url_components.scheme.lower() == 'socks4a':
socks_type = ProxyType.SOCKS4A socks_type = ProxyType.SOCKS4A
def unquote_if_non_empty(s):
if not s:
return s
return compat_urllib_parse_unquote_plus(s)
proxy_args = ( proxy_args = (
socks_type, socks_type,
url_components.hostname, url_components.port or 1080, url_components.hostname, url_components.port or 1080,
True, # Remote DNS True, # Remote DNS
compat_urllib_parse_unquote_plus(url_components.username), unquote_if_non_empty(url_components.username),
compat_urllib_parse_unquote_plus(url_components.password), unquote_if_non_empty(url_components.password),
) )
class SocksConnection(base_class): class SocksConnection(base_class):