From: Yann E. MORIN Date: Thu, 22 Dec 2016 21:09:32 +0000 (+0100) Subject: bin/pwclient: accept alternate http_proxy forms X-Git-Tag: v2.0.0-rc1~132 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cf9468870936c7ee8229208e50ff16c85faab3f;p=thirdparty%2Fpatchwork.git bin/pwclient: accept alternate http_proxy forms The forms for http_proxy (and the likes) is not very well defined nor documented in any authoritaive place. However, there are two common forms: http://host:port or http://host:port/ Currently, the code chokes on the latter (e.g. with http_proxy=http://127.0.0.1:8080/ ): [...] File "/usr/lib/python2.7/httplib.py", line 792, in _get_hostport raise InvalidURL("nonnumeric port: '%s'" % host[i+1:]) httplib.InvalidURL: nonnumeric port: '8080/' Chop off any slash character in the port definition to accept the second form. If there is no '/' in there, it still works. Signed-off-by: "Yann E. MORIN" Signed-off-by: Stephen Finucane --- diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient index cee8e2c0..28e925a0 100755 --- a/patchwork/bin/pwclient +++ b/patchwork/bin/pwclient @@ -128,7 +128,7 @@ class Transport(xmlrpclib.SafeTransport): def make_connection(self, host): self.host = host if self.proxy: - host = self.proxy.split('://', 1)[-1] + host = self.proxy.split('://', 1)[-1].rstrip('/') if self.credentials: host = '@'.join([self.credentials, host]) if self.https: