docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Client._timeout to timeout.

This commit is contained in:
Greg Taylor 2015-02-04 20:19:22 -05:00
parent 39ee2d55b2
commit 168e8c7e18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/client.py
View File

@ -56,8 +56,8 @@ class Client(requests.Session):
) )
) )
self.base_url = base_url self.base_url = base_url
self.timeout = timeout
self._version = version self._version = version
self._timeout = timeout
self._auth_configs = auth.load_config() self._auth_configs = auth.load_config()
# Use SSLAdapter for the ability to specify SSL version # Use SSLAdapter for the ability to specify SSL version
@ -71,7 +71,7 @@ class Client(requests.Session):
def _set_request_timeout(self, kwargs): def _set_request_timeout(self, kwargs):
"""Prepare the kwargs for an HTTP request by inserting the timeout """Prepare the kwargs for an HTTP request by inserting the timeout
parameter, if not already present.""" parameter, if not already present."""
kwargs.setdefault('timeout', self._timeout) kwargs.setdefault('timeout', self.timeout)
return kwargs return kwargs
def _post(self, url, **kwargs): def _post(self, url, **kwargs):
@ -954,7 +954,7 @@ class Client(requests.Session):
params = {'t': timeout} params = {'t': timeout}
url = self._url("/containers/{0}/stop".format(container)) url = self._url("/containers/{0}/stop".format(container))
res = self._post(url, params=params, res = self._post(url, params=params,
timeout=(timeout + self._timeout)) timeout=(timeout + self.timeout))
self._raise_for_status(res) self._raise_for_status(res)
def tag(self, image, repository, tag=None, force=False): def tag(self, image, repository, tag=None, force=False):