Permalink
Browse files

Merge pull request #1923 from Lukasa/master

The timeout is in seconds.
  • Loading branch information...
2 parents 3c88e52 + 81e88b7 commit e909a923431be2597498c33adc57707f0488bc76 @Lukasa Lukasa committed Feb 16, 2014
Showing with 2 additions and 2 deletions.
  1. +1 −1 requests/api.py
  2. +1 −1 requests/sessions.py
View
@@ -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.
@@ -328,7 +328,7 @@ def request(self, method, url,
:param auth: (optional) Auth tuple or callable to enable
Basic/Digest/Custom HTTP Auth.
:param timeout: (optional) Float describing the timeout of the
- request.
+ request in seconds.
:param allow_redirects: (optional) Boolean. Set to True by default.
:param proxies: (optional) Dictionary mapping protocol to the URL of
the proxy.

0 comments on commit e909a92

Please sign in to comment.