mirrors/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the printing of the proxy map in debug mode

Browse Source 
The proxies have to be extracted from the opener.handlers
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-10-07 21:10:31 +02:00
parent b2ad967e45
commit 2ae3edb1cf
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/__init__.py
View File

@ -448,7 +448,7 @@ def _real_main(argv=None):
all_urls = batchurls + args
all_urls = [url.strip() for url in all_urls]
_setup_opener(jar=jar, opts=opts)
opener = _setup_opener(jar=jar, opts=opts)
extractors = gen_extractors()
@ -641,7 +641,12 @@ def _real_main(argv=None):
except:
pass
write_string(u'[debug] Python version %s - %s' %(platform.python_version(), platform_name()) + u'\n')
write_string(u'[debug] Proxy map: ' + str(proxy_handler.proxies) + u'\n')
proxy_map = {}
for handler in opener.handlers:
if hasattr(handler, 'proxies'):
proxy_map.update(handler.proxies)
write_string(u'[debug] Proxy map: ' + compat_str(proxy_map) + u'\n')
ydl.add_default_info_extractors()