Allow unsetting the proxy with the --proxy option

This commit is contained in:
Philipp Hagemeister 2013-06-09 23:43:18 +02:00
parent 8027175600
commit 53f72b11e5

View File

@ -392,8 +392,11 @@ def _real_main(argv=None):
# General configuration # General configuration
cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar) cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
if opts.proxy: if opts.proxy is not None:
proxies = {'http': opts.proxy, 'https': opts.proxy} if opts.proxy == '':
proxies = {}
else:
proxies = {'http': opts.proxy, 'https': opts.proxy}
else: else:
proxies = compat_urllib_request.getproxies() proxies = compat_urllib_request.getproxies()
# Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805) # Set HTTPS proxy to HTTP one if given (https://github.com/rg3/youtube-dl/issues/805)