Merge pull request #805 from sourcelair/enhancement/stats-no-stream

Add support for non-stream stats of containers

1 files changed, 7 insertions, 2 deletions

diff --git a/docker/api/container.py b/docker/api/container.py
index 49c0b95..00fa169 100644
--- a/docker/api/container.py
+++ b/docker/api/container.py
@@ -356,9 +356,14 @@ class ContainerApiMixin(object):
 
     @utils.minimum_version('1.17')
     @utils.check_resource
-    def stats(self, container, decode=None):
+    def stats(self, container, decode=None, stream=True):
         url = self._url("/containers/{0}/stats", container)
-        return self._stream_helper(self._get(url, stream=True), decode=decode)
+        if stream:
+            return self._stream_helper(self._get(url, stream=True),
+                                       decode=decode)
+        else:
+            return self._result(self._get(url, params={'stream': False}),
+                                json=True)
 
     @utils.check_resource
     def stop(self, container, timeout=10):