Skip to content

Rename Client._timeout to timeout. #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2015
Merged

Rename Client._timeout to timeout. #475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ def __init__(self, base_url=None, version=DEFAULT_DOCKER_API_VERSION,
)
)
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
Expand All @@ -71,7 +71,7 @@ def __init__(self, base_url=None, version=DEFAULT_DOCKER_API_VERSION,
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):
Expand Down Expand Up @@ -954,7 +954,7 @@ def stop(self, container, timeout=10):
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):
Expand Down