summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-06-27 18:00:55 -0700
committerJoffrey F <joffrey@docker.com>2016-06-28 11:03:52 -0700
commit5480493662df912f13b2d31ee217c425bef003e0 (patch)
tree3201f787554bc1685ff76cb2908196f2d9e60bde
parent986a14a152d20df6bb8622516ab2d18af73e5e20 (diff)
downloaddocker-py-5480493662df912f13b2d31ee217c425bef003e0.tar.gz
signal in Client.kill can be a string containing the signal's name
Signed-off-by: Joffrey F <joffrey@docker.com>
-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 b591b17..9cc14db 100644
--- a/docker/api/container.py
+++ b/docker/api/container.py
@@ -187,7 +187,9 @@ class ContainerApiMixin(object):
url = self._url("/containers/{0}/kill", container)
params = {}
if signal is not None:
- params['signal'] = int(signal)
+ if not isinstance(signal, six.string_types):
+ signal = int(signal)
+ params['signal'] = signal
res = self._post(url, params=params)
self._raise_for_status(res)