From eb29b424b00eb00df8267693ede65799cc0e879b Mon Sep 17 00:00:00 2001 From: Bridget McErlean Date: Wed, 12 Aug 2015 11:53:34 +0100 Subject: [PATCH 1/2] Change minimum API version for exec_inspect --- docker/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/client.py b/docker/client.py index f79ec7bb09..46682d1086 100644 --- a/docker/client.py +++ b/docker/client.py @@ -306,8 +306,8 @@ def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False, return self._result(res, True) def exec_inspect(self, exec_id): - if utils.compare_version('1.15', self._version) < 0: - raise errors.InvalidVersion('Exec is not supported in API < 1.15') + if utils.compare_version('1.16', self._version) < 0: + raise errors.InvalidVersion('Exec is not supported in API < 1.16') if isinstance(exec_id, dict): exec_id = exec_id.get('Id') res = self._get(self._url("/exec/{0}/json".format(exec_id))) From 7ba83323b68b449dc046530202ab7aba61696021 Mon Sep 17 00:00:00 2001 From: Bridget McErlean Date: Wed, 12 Aug 2015 23:13:43 +0100 Subject: [PATCH 2/2] Update error message to state that exec_inspect is not supported --- docker/client.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 46682d1086..0cb19c776a 100644 --- a/docker/client.py +++ b/docker/client.py @@ -307,7 +307,9 @@ def exec_create(self, container, cmd, stdout=True, stderr=True, tty=False, def exec_inspect(self, exec_id): if utils.compare_version('1.16', self._version) < 0: - raise errors.InvalidVersion('Exec is not supported in API < 1.16') + raise errors.InvalidVersion( + 'exec_inspect is not supported in API < 1.16' + ) if isinstance(exec_id, dict): exec_id = exec_id.get('Id') res = self._get(self._url("/exec/{0}/json".format(exec_id)))