From 3cd4ff0d4a5f0ba91e74a1841b563624b6717077 Mon Sep 17 00:00:00 2001 From: Seth Prime Date: Tue, 31 Oct 2017 08:37:19 -0300 Subject: [PATCH 1/3] Update --help documentation for SOCKS proxy to include authentication syntax --- youtube_dl/options.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 4c0455044..4d112a29b 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -204,9 +204,11 @@ def parseOpts(overrideArguments=None): '--proxy', dest='proxy', default=None, metavar='URL', 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') + 'SOCKS proxy, specify a proper scheme. a proper scheme. ' + 'For example socks5://hostname:port/ or ' + 'socks5://username:password@hostname:port/ for username and ' + 'password authentication. Pass in an empty string (--proxy "") for ' + 'direct connection.') network.add_option( '--socket-timeout', dest='socket_timeout', type=float, default=None, metavar='SECONDS', From 78ea3923fd9013c554699aab2d751c9c7fa2ca37 Mon Sep 17 00:00:00 2001 From: Seth Prime Date: Tue, 31 Oct 2017 12:26:38 -0300 Subject: [PATCH 2/3] Update commit message to remove duplicate phrasing of specifying a proper scheme --- youtube_dl/options.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index 4d112a29b..c1ff1430c 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -204,11 +204,10 @@ def parseOpts(overrideArguments=None): '--proxy', dest='proxy', default=None, metavar='URL', help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable experimental ' - 'SOCKS proxy, specify a proper scheme. a proper scheme. ' - 'For example socks5://hostname:port/ or ' - 'socks5://username:password@hostname:port/ for username and ' - 'password authentication. Pass in an empty string (--proxy "") for ' - 'direct connection.') + 'SOCKS proxy, specify a proper scheme. For example ' + 'socks5://hostname:port/ or socks5://username:password@hostname:port/ ' + 'for username and password authentication. Pass in an empty string ' + '(--proxy "") for direct connection.') network.add_option( '--socket-timeout', dest='socket_timeout', type=float, default=None, metavar='SECONDS', From f00f965c43b900d438f0e2ebb9c706e9dfe8cbc7 Mon Sep 17 00:00:00 2001 From: Seth Prime Date: Wed, 1 Nov 2017 21:47:12 -0300 Subject: [PATCH 3/3] Update description of proxy help in options.p to include using HTTP/HTTPS --- youtube_dl/options.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/youtube_dl/options.py b/youtube_dl/options.py index c1ff1430c..5fadfd7ac 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -203,11 +203,12 @@ def parseOpts(overrideArguments=None): network.add_option( '--proxy', dest='proxy', default=None, metavar='URL', - help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable experimental ' - 'SOCKS proxy, specify a proper scheme. For example ' - 'socks5://hostname:port/ or socks5://username:password@hostname:port/ ' - 'for username and password authentication. Pass in an empty string ' - '(--proxy "") for direct connection.') + help='Use the specified HTTP/HTTPS/SOCKS proxy. To enable HTTP/HTTPS ' + 'or experimental SOCKS proxy, specify a proper scheme. For example ' + 'protocol://hostname:port/ or protocol://username:password@hostname:port/ ' + 'for username and password authentication. The protocol attribute ' + 'can be exchanged with a string like http, https or socks5. Pass ' + 'in an empty string (--proxy "") for direct connection.') network.add_option( '--socket-timeout', dest='socket_timeout', type=float, default=None, metavar='SECONDS',