From 219c24e744a019628d851116f4a1e1f7e53e7183 Mon Sep 17 00:00:00 2001 From: BobDu Date: Wed, 23 Jan 2019 10:11:56 +0800 Subject: [PATCH 1/2] Fixed an issue with inaccurate comments. Signed-off-by: BobDu --- docker/api/container.py | 2 +- docker/models/containers.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/api/container.py b/docker/api/container.py index 5a267d13f..9f0f2c0e1 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -843,7 +843,7 @@ def logs(self, container, stdout=True, stderr=True, stream=False, float (in fractional seconds) Returns: - (generator or str) + (generator iterator of output bytes or bytes) Raises: :py:class:`docker.errors.APIError` diff --git a/docker/models/containers.py b/docker/models/containers.py index 32676bb85..9a006ba50 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -310,7 +310,8 @@ def logs(self, **kwargs): float (in nanoseconds) Returns: - (generator or str): Logs from the container. + (generatoran iterator of output bytes or bytes): + Logs from the container. Raises: :py:class:`docker.errors.APIError` From 0054f75af096c3c6316451f8569617d40700e5f9 Mon Sep 17 00:00:00 2001 From: BobDu Date: Fri, 19 Apr 2019 11:56:47 +0800 Subject: [PATCH 2/2] Change using generator iterator. Signed-off-by: BobDu --- docker/api/container.py | 2 +- docker/models/containers.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/api/container.py b/docker/api/container.py index 9f0f2c0e1..1f363ee34 100644 --- a/docker/api/container.py +++ b/docker/api/container.py @@ -843,7 +843,7 @@ def logs(self, container, stdout=True, stderr=True, stream=False, float (in fractional seconds) Returns: - (generator iterator of output bytes or bytes) + (generator of bytes or bytes) Raises: :py:class:`docker.errors.APIError` diff --git a/docker/models/containers.py b/docker/models/containers.py index 9a006ba50..4a1c8ff36 100644 --- a/docker/models/containers.py +++ b/docker/models/containers.py @@ -310,8 +310,7 @@ def logs(self, **kwargs): float (in nanoseconds) Returns: - (generatoran iterator of output bytes or bytes): - Logs from the container. + (generator of bytes or bytes): Logs from the container. Raises: :py:class:`docker.errors.APIError`