laudom/haruhi-dl
2
0
Fork 0
Code Issues 13 Pull requests Packages Projects Releases Wiki Activity

Allow unsetting the proxy with the --proxy option

Browse source
This commit is contained in:
Philipp Hagemeister 2013-06-09 23:43:18 +02:00
parent 8027175600
commit 53f72b11e5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
youtube_dl/__init__.py
View file

@ -392,7 +392,10 @@ def _real_main(argv=None):
# General configuration
cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
if opts.proxy:
if opts.proxy is not None:
if opts.proxy == '':
proxies = {}
else:
proxies = {'http': opts.proxy, 'https': opts.proxy}
else:
proxies = compat_urllib_request.getproxies()