summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Labouisse <christophe@labouisse.org>2015-02-11 07:19:27 +0100
committerChristophe Labouisse <christophe@labouisse.org>2015-02-11 07:27:30 +0100
commitea28ebb5f14b694b913557abe474895562353e2f (patch)
tree30f2d5ae84a7445ff861b617b756c383a548e408
parent9bd71b2d4573a4431aa13ed1d764022263d2639c (diff)
downloaddocker-py-ea28ebb5f14b694b913557abe474895562353e2f.tar.gz
Add a `decode` parameter to the events command
This will ensure compatibility with the previous versions of docker-py. Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
-rw-r--r--docker/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/client.py b/docker/client.py
index 5ce83ba..cba8d39 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -569,7 +569,7 @@ class Client(requests.Session):
return self._result(self._get(self._url("/containers/{0}/changes".
format(container))), True)
- def events(self, since=None, until=None, filters=None):
+ def events(self, since=None, until=None, filters=None, decode=None):
if isinstance(since, datetime):
since = utils.datetime_to_timestamp(since)
@@ -587,7 +587,7 @@ class Client(requests.Session):
return self._stream_helper(self.get(self._url('/events'),
params=params, stream=True),
- decode=True)
+ decode=decode)
def execute(self, container, cmd, detach=False, stdout=True, stderr=True,
stream=False, tty=False):