diff options
| author | Greg Taylor <gtaylor@gc-taylor.com> | 2015-02-04 20:19:22 -0500 |
|---|---|---|
| committer | Greg Taylor <gtaylor@gc-taylor.com> | 2015-02-04 20:19:22 -0500 |
| commit | 168e8c7e186d617837105d8834d593bbfff2e96d (patch) | |
| tree | 7604ed28866d19e3205e3603c4bdd379e27a9a24 | |
| parent | 39ee2d55b2df24865095e032a50210aa42aa743a (diff) | |
| download | docker-py-168e8c7e186d617837105d8834d593bbfff2e96d.tar.gz | |
Rename Client._timeout to timeout.
| -rw-r--r-- | docker/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/client.py b/docker/client.py index 777c20d..179e9d3 100644 --- a/docker/client.py +++ b/docker/client.py @@ -56,8 +56,8 @@ class Client(requests.Session): ) ) self.base_url = base_url + self.timeout = timeout self._version = version - self._timeout = timeout self._auth_configs = auth.load_config() # Use SSLAdapter for the ability to specify SSL version @@ -71,7 +71,7 @@ class Client(requests.Session): def _set_request_timeout(self, kwargs): """Prepare the kwargs for an HTTP request by inserting the timeout parameter, if not already present.""" - kwargs.setdefault('timeout', self._timeout) + kwargs.setdefault('timeout', self.timeout) return kwargs def _post(self, url, **kwargs): @@ -954,7 +954,7 @@ class Client(requests.Session): params = {'t': timeout} url = self._url("/containers/{0}/stop".format(container)) res = self._post(url, params=params, - timeout=(timeout + self._timeout)) + timeout=(timeout + self.timeout)) self._raise_for_status(res) def tag(self, image, repository, tag=None, force=False): |