diff options
| author | Donald Stufft <donald@stufft.io> | 2014-05-16 22:21:32 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-05-16 22:21:32 -0400 |
| commit | 81f21f2261d422d243f66b2dfeef0faae72ab119 (patch) | |
| tree | 564425afe21fd919eadebce74fb8e35ba765392e /pip/_vendor/requests/api.py | |
| parent | 6c71953b543cd15e611b2cc05178902e0e4afe42 (diff) | |
| parent | 52ffb9f9ea88596e7a7953eaf04eaed681bf19cf (diff) | |
| download | pip-81f21f2261d422d243f66b2dfeef0faae72ab119.tar.gz | |
Merge branch '1.5.X'1.5.6
Conflicts:
CHANGES.txt
Diffstat (limited to 'pip/_vendor/requests/api.py')
| -rw-r--r-- | pip/_vendor/requests/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pip/_vendor/requests/api.py b/pip/_vendor/requests/api.py index baf43dd61..01d853d5c 100644 --- a/pip/_vendor/requests/api.py +++ b/pip/_vendor/requests/api.py @@ -26,7 +26,7 @@ def request(method, url, **kwargs): :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`. :param files: (optional) Dictionary of 'name': file-like-objects (or {'name': ('filename', fileobj)}) for multipart encoding upload. :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth. - :param timeout: (optional) Float describing the timeout of the request. + :param timeout: (optional) Float describing the timeout of the request in seconds. :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed. :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy. :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided. |