Commit 91f8fb8a authored by Julien Muchembled's avatar Julien Muchembled

Fix parsing of --registry url with ipv6 host

parent 0614d1d7
...@@ -27,7 +27,7 @@ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler ...@@ -27,7 +27,7 @@ from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from email.mime.text import MIMEText from email.mime.text import MIMEText
from operator import itemgetter from operator import itemgetter
from OpenSSL import crypto from OpenSSL import crypto
from urllib import splittype, splithost, splitport, urlencode from urllib import splittype, splithost, unquote, urlencode
from . import ctl, tunnel, utils, version, x509 from . import ctl, tunnel, utils, version, x509
HMAC_HEADER = "Re6stHMAC" HMAC_HEADER = "Re6stHMAC"
...@@ -569,10 +569,9 @@ class RegistryClient(object): ...@@ -569,10 +569,9 @@ class RegistryClient(object):
self.auto_close = auto_close self.auto_close = auto_close
scheme, host = splittype(url) scheme, host = splittype(url)
host, path = splithost(host) host, path = splithost(host)
host, port = splitport(host)
self._conn = dict(http=httplib.HTTPConnection, self._conn = dict(http=httplib.HTTPConnection,
https=httplib.HTTPSConnection, https=httplib.HTTPSConnection,
)[scheme](host, port, timeout=60) )[scheme](unquote(host), timeout=60)
self._path = path.rstrip('/') self._path = path.rstrip('/')
def __getattr__(self, name): def __getattr__(self, name):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment