From b9576c1d2315476da224d65dc0288c1ccb8e34db Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 2 Nov 2016 16:28:23 -0700 Subject: [PATCH 1/2] Fix NpipeSocket.settimeout to match expected behavior Signed-off-by: Joffrey F --- docker/transport/npipesocket.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/transport/npipesocket.py b/docker/transport/npipesocket.py index 48a9f92fd2..3b1b6445a8 100644 --- a/docker/transport/npipesocket.py +++ b/docker/transport/npipesocket.py @@ -169,13 +169,16 @@ def setblocking(self, flag): def settimeout(self, value): if value is None: - self._timeout = win32pipe.NMPWAIT_NOWAIT + # Blocking mode + self._timeout = win32pipe.NMPWAIT_WAIT_FOREVER elif not isinstance(value, (float, int)) or value < 0: raise ValueError('Timeout value out of range') elif value == 0: - self._timeout = win32pipe.NMPWAIT_USE_DEFAULT_WAIT + # Non-blocking mode + self._timeout = win32pipe.NMPWAIT_NO_WAIT else: - self._timeout = value + # Timeout mode - Value converted to milliseconds + self._timeout = value * 1000 def gettimeout(self): return self._timeout From 80ad7384e2b4ec8006426f4f0e73a2969b959230 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 2 Nov 2016 16:41:31 -0700 Subject: [PATCH 2/2] Bumped version to 1.10.6 - Updated changelog Signed-off-by: Joffrey F --- docker/version.py | 2 +- docs/change_log.md | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docker/version.py b/docker/version.py index 6551711f2d..27d014c059 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "1.10.5" +version = "1.10.6" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) diff --git a/docs/change_log.md b/docs/change_log.md index a6f4e501a0..1cc1fccf5d 100644 --- a/docs/change_log.md +++ b/docs/change_log.md @@ -1,10 +1,21 @@ Change Log ========== +1.10.6 +------ + +[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/26?closed=1) + +### Bugfixes + +* Fixed an issue where setting a `NpipeSocket` instance to blocking mode would + put it in non-blocking mode and vice-versa. + + 1.10.5 ------ -[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/24?closed=1) +[List of PRs / issues for this release](https://github.com/docker/docker-py/milestone/25?closed=1) ### Bugfixes