docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed string formatting in utils

This commit is contained in:
nir0s 2015-02-11 22:24:06 +02:00
parent d0512028be
commit 53b5ed2178
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/utils/utils.py
View File

@ -163,11 +163,11 @@ def convert_volume_binds(binds):
result = [] result = []
for k, v in binds.items(): for k, v in binds.items():
if isinstance(v, dict): if isinstance(v, dict):
result.append('%s:%s:%s' % ( result.append('{0}:{1}:{2}'.format(
k, v['bind'], 'ro' if v.get('ro', False) else 'rw' k, v['bind'], 'ro' if v.get('ro', False) else 'rw'
)) ))
else: else:
result.append('%s:%s:rw' % (k, v)) result.append('{0}:{1}:rw'.format(k, v))
return result return result
@ -201,7 +201,8 @@ def parse_host(addr):
addr = addr.replace('http+unix://', 'unix://') addr = addr.replace('http+unix://', 'unix://')
if addr == 'tcp://': if addr == 'tcp://':
raise errors.DockerException("Invalid bind address format: %s" % addr) raise errors.DockerException(
"Invalid bind address format: {0}".format(addr))
elif addr.startswith('unix://'): elif addr.startswith('unix://'):
addr = addr[7:] addr = addr[7:]
elif addr.startswith('tcp://'): elif addr.startswith('tcp://'):
@ -215,7 +216,7 @@ def parse_host(addr):
else: else:
if "://" in addr: if "://" in addr:
raise errors.DockerException( raise errors.DockerException(
"Invalid bind address protocol: %s" % addr "Invalid bind address protocol: {0]".format(addr)
) )
proto = "http" proto = "http"
@ -223,7 +224,7 @@ def parse_host(addr):
host_parts = addr.split(':') host_parts = addr.split(':')
if len(host_parts) != 2: if len(host_parts) != 2:
raise errors.DockerException( raise errors.DockerException(
"Invalid bind address format: %s" % addr "Invalid bind address format: {0}".format(addr)
) )
if host_parts[0]: if host_parts[0]:
host = host_parts[0] host = host_parts[0]
@ -236,13 +237,14 @@ def parse_host(addr):
) )
elif proto in ("http", "https") and ':' not in addr: elif proto in ("http", "https") and ':' not in addr:
raise errors.DockerException("Bind address needs a port: %s" % addr) raise errors.DockerException(
"Bind address needs a port: {0}".format(addr))
else: else:
host = addr host = addr
if proto == "http+unix": if proto == "http+unix":
return "%s://%s" % (proto, host) return "{0}://{1}".format(proto, host)
return "%s://%s:%d" % (proto, host, port) return "{0}://{1}:{2}" % (proto, host, port)
def parse_devices(devices): def parse_devices(devices):