commit: 6ddb4888d2610df3bbb5024440caddde50fe9ad8
parent fa5cb8d0212918657cb58b4d5791ed3de831bd74
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sun, 8 May 2016 15:15:58 +0800
[options] Update --proxy description for SOCKS proxies
Diffstat:
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
@@ -188,7 +188,10 @@ def parseOpts(overrideArguments=None):
network.add_option(
'--proxy', dest='proxy',
default=None, metavar='URL',
- help='Use the specified HTTP/HTTPS proxy. Pass in an empty string (--proxy "") for direct connection')
+ help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable experimental '
+ 'SOCKS proxy, specify a proper scheme. For example '
+ 'socks5://127.0.0.1:1080/. Pass in an empty string (--proxy "") '
+ 'for direct connection')
network.add_option(
'--socket-timeout',
dest='socket_timeout', type=float, default=None, metavar='SECONDS',