summaryrefslogtreecommitdiff
path: root/docker/utils/utils.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-10-12 16:06:43 -0700
committerJoffrey F <joffrey@docker.com>2016-10-12 16:06:43 -0700
commit05f1060824e6567629351618bf1989df5826fda7 (patch)
treecb519d67adc8c16102ad25c29670d0e3f9570ffa /docker/utils/utils.py
parent008730c670afb2f88c7db308901586fb24f1a60c (diff)
downloaddocker-py-base_url_trailing_slash.tar.gz
Remove trailing slashes in result of utils.parse_hostbase_url_trailing_slash
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/utils/utils.py')
-rw-r--r--docker/utils/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index b565732..e1c7ad0 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -453,8 +453,8 @@ def parse_host(addr, is_win32=False, tls=False):
"Bind address needs a port: {0}".format(addr))
if proto == "http+unix" or proto == 'npipe':
- return "{0}://{1}".format(proto, host)
- return "{0}://{1}:{2}{3}".format(proto, host, port, path)
+ return "{0}://{1}".format(proto, host).rstrip('/')
+ return "{0}://{1}:{2}{3}".format(proto, host, port, path).rstrip('/')
def parse_devices(devices):