diff --git a/AUTHORS.rst b/AUTHORS.rst index 99639230..6bbddfde 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -121,4 +121,3 @@ Patches and Suggestions - Vinod Chandru - Johnny Goodnow - Denis Ryzhkov -- Wilfred Hughes @dontYetKnow diff --git a/requests/adapters.py b/requests/adapters.py index c38cd080..6f507da8 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -45,6 +45,7 @@ class BaseAdapter(object): class HTTPAdapter(BaseAdapter): """Built-In HTTP Adapter for Urllib3.""" def __init__(self, pool_connections=DEFAULT_POOLSIZE, pool_maxsize=DEFAULT_POOLSIZE): + self.max_retries = DEFAULT_RETRIES self.config = {} super(HTTPAdapter, self).__init__() @@ -165,7 +166,7 @@ class HTTPAdapter(BaseAdapter): request.headers['Proxy-Authorization'] = _basic_auth_str(username, password) - def send(self, request, stream=False, timeout=None, max_retries=DEFAULT_RETRIES, verify=True, cert=None, proxies=None): + def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None): """Sends PreparedRequest object. Returns Response object.""" conn = self.get_connection(request.url, proxies) @@ -187,7 +188,7 @@ class HTTPAdapter(BaseAdapter): assert_same_host=False, preload_content=False, decode_content=False, - retries=max_retries, + retries=self.max_retries, timeout=timeout ) diff --git a/requests/api.py b/requests/api.py index d0023807..baf43dd6 100644 --- a/requests/api.py +++ b/requests/api.py @@ -27,7 +27,6 @@ def request(method, url, **kwargs): :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 max_retries: (optional) The maximum number of retries (defaults to 0). :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. diff --git a/requests/sessions.py b/requests/sessions.py index 10251087..f2b60ec8 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -80,7 +80,7 @@ def merge_kwargs(local_kwarg, default_kwarg): class SessionRedirectMixin(object): def resolve_redirects(self, resp, req, stream=False, timeout=None, - max_retries=0, verify=True, cert=None, proxies=None): + verify=True, cert=None, proxies=None): """Receives a Response. Returns a generator of Responses.""" i = 0 @@ -149,7 +149,6 @@ class SessionRedirectMixin(object): prepared_request, stream=stream, timeout=timeout, - max_retries=max_retries, verify=verify, cert=cert, proxies=proxies, @@ -238,7 +237,6 @@ class Session(SessionRedirectMixin): files=None, auth=None, timeout=None, - max_retries=0, allow_redirects=True, proxies=None, hooks=None, @@ -306,7 +304,6 @@ class Session(SessionRedirectMixin): send_kwargs = { 'stream': stream, 'timeout': timeout, - 'max_retries': max_retries, 'verify': verify, 'cert': cert, 'proxies': proxies, @@ -402,7 +399,6 @@ class Session(SessionRedirectMixin): req = kwargs.pop('req', None) stream = kwargs.get('stream', False) timeout = kwargs.get('timeout') - max_retries = kwargs.get('max_retries') verify = kwargs.get('verify') cert = kwargs.get('cert') proxies = kwargs.get('proxies') @@ -423,8 +419,7 @@ class Session(SessionRedirectMixin): # Redirect resolving generator. gen = self.resolve_redirects(r, request, stream=stream, - timeout=timeout, max_retries=max_retries, - verify=verify, cert=cert, + timeout=timeout, verify=verify, cert=cert, proxies=proxies) # Resolve redirects if allowed.