diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2017-03-28 15:53:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 15:53:46 -0700 |
| commit | 599aa1a89a1e9d6905f6133595062a8e3b58025d (patch) | |
| tree | 77e591bbaccca11afe1d4638c21888cc56d96181 /docker | |
| parent | b474ea2fd6357a3abd3942e589001f41cb6b3f6b (diff) | |
| parent | 4a51e787318ad81331815c99e1a575892cf36e4b (diff) | |
| download | docker-py-2.2.1.tar.gz | |
Merge pull request #1536 from docker/2.2.1-release2.2.1
2.2.1 release
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/api/daemon.py | 3 | ||||
| -rw-r--r-- | docker/errors.py | 2 | ||||
| -rw-r--r-- | docker/version.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docker/api/daemon.py b/docker/api/daemon.py index 00367bc..91c777f 100644 --- a/docker/api/daemon.py +++ b/docker/api/daemon.py @@ -68,9 +68,10 @@ class DaemonApiMixin(object): 'until': until, 'filters': filters } + url = self._url('/events') return self._stream_helper( - self._get(self._url('/events'), params=params, stream=True), + self._get(url, params=params, stream=True, timeout=None), decode=decode ) diff --git a/docker/errors.py b/docker/errors.py index d9b197d..03b89c1 100644 --- a/docker/errors.py +++ b/docker/errors.py @@ -59,7 +59,7 @@ class APIError(requests.exceptions.HTTPError, DockerException): @property def status_code(self): - if self.response: + if self.response is not None: return self.response.status_code def is_client_error(self): diff --git a/docker/version.py b/docker/version.py index b2474bd..08c792b 100644 --- a/docker/version.py +++ b/docker/version.py @@ -1,2 +1,2 @@ -version = "2.2.0" +version = "2.2.1" version_info = tuple([int(d) for d in version.split("-")[0].split(".")]) |