Skip to content

D
docker-py
Kaydet (Commit) 6d78986c authored tarafından shin-'s avatar shin-
Dosyalara gözat
Seçenekler

Fixed multiplexed_socket_stream_helper

üst 93bb0c5b
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 19 deletions
docker/client.py
Dosyayı görüntüle @ 6d78986c
...@@ -169,27 +169,27 @@ class Client(requests.Session): ...@@ -169,27 +169,27 @@ class Client(requests.Session):
stdin_once = True stdin_once = True
return { return {
'Hostname': hostname, 'Hostname': hostname,
'Domainname': domainname, 'Domainname': domainname,
'ExposedPorts': ports, 'ExposedPorts': ports,
'User': user, 'User': user,
'Tty': tty, 'Tty': tty,
'OpenStdin': stdin_open, 'OpenStdin': stdin_open,
'StdinOnce': stdin_once, 'StdinOnce': stdin_once,
'Memory': mem_limit, 'Memory': mem_limit,
'AttachStdin': attach_stdin, 'AttachStdin': attach_stdin,
'AttachStdout': attach_stdout, 'AttachStdout': attach_stdout,
'AttachStderr': attach_stderr, 'AttachStderr': attach_stderr,
'Env': environment, 'Env': environment,
'Cmd': command, 'Cmd': command,
'Dns': dns, 'Dns': dns,
'Image': image, 'Image': image,
'Volumes': volumes, 'Volumes': volumes,
'VolumesFrom': volumes_from, 'VolumesFrom': volumes_from,
'NetworkDisabled': network_disabled, 'NetworkDisabled': network_disabled,
'Entrypoint': entrypoint, 'Entrypoint': entrypoint,
'CpuShares': cpu_shares, 'CpuShares': cpu_shares,
'WorkingDir': working_dir 'WorkingDir': working_dir
} }
def _post_json(self, url, data, **kwargs): def _post_json(self, url, data, **kwargs):
...@@ -271,8 +271,6 @@ class Client(requests.Session): ...@@ -271,8 +271,6 @@ class Client(requests.Session):
sep = bytes() if six.PY3 else str() sep = bytes() if six.PY3 else str()
data = sep.join(blocks) data = sep.join(blocks)
if six.PY3:
data = data.decode('utf-8')
return data return data
while True: while True:
......
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