summaryrefslogtreecommitdiff
path: root/docker/api/container.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2017-08-16 17:31:36 -0700
committerJoffrey F <joffrey@docker.com>2017-08-16 18:13:12 -0700
commit7bf11c93ba9ffa7be228aa0a0c62155c6fc80e35 (patch)
tree3c0f9f4223bd727171079673de846fa002cca1ab /docker/api/container.py
parent6f6c29ce36128d712109ff27d557d67dae087da3 (diff)
downloaddocker-py-fix_upgraded_tty_streams.tar.gz
Fix handling of non-multiplexed (TTY) streams over upgraded socketsfix_upgraded_tty_streams
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api/container.py')
-rw-r--r--docker/api/container.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/api/container.py b/docker/api/container.py
index 06c575d..dde1325 100644
--- a/docker/api/container.py
+++ b/docker/api/container.py
@@ -52,7 +52,9 @@ class ContainerApiMixin(object):
u = self._url("/containers/{0}/attach", container)
response = self._post(u, headers=headers, params=params, stream=stream)
- return self._read_from_socket(response, stream)
+ return self._read_from_socket(
+ response, stream, self._check_is_tty(container)
+ )
@utils.check_resource('container')
def attach_socket(self, container, params=None, ws=False):