Skip to content

Add a default timeout to request #198

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

Closed
wants to merge 1 commit into from
Closed

Add a default timeout to request #198

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
7 changes: 4 additions & 3 deletions dropbox/oauth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
TOKEN_ACCESS_TYPES = ['offline', 'online', 'legacy']
INCLUDE_GRANTED_SCOPES_TYPES = ['user', 'team']
PKCE_VERIFIER_LENGTH = 128
DEFAULT_REQUEST_TIMEOUT=60

class OAuth2FlowNoRedirectResult(object):
"""
Expand Down Expand Up @@ -126,11 +127,10 @@ def __repr__(self):
self.expires_at,
)


class DropboxOAuth2FlowBase(object):

def __init__(self, consumer_key, consumer_secret=None, locale=None, token_access_type='legacy',
scope=None, include_granted_scopes=None, use_pkce=False):
scope=None, include_granted_scopes=None, use_pkce=False, timeout=DEFAULT_REQUEST_TIMEOUT):
if scope is not None and (len(scope) == 0 or not isinstance(scope, list)):
raise BadInputException("Scope list must be of type list")
if token_access_type is not None and token_access_type not in TOKEN_ACCESS_TYPES:
Expand All @@ -145,6 +145,7 @@ def __init__(self, consumer_key, consumer_secret=None, locale=None, token_access
self.consumer_secret = consumer_secret
self.locale = locale
self.token_access_type = token_access_type
self.request_timeout = timeout
self.requests_session = pinned_session()
self.scope = scope
self.include_granted_scopes = include_granted_scopes
Expand Down Expand Up @@ -195,7 +196,7 @@ def _finish(self, code, redirect_uri, code_verifier):
if redirect_uri is not None:
params['redirect_uri'] = redirect_uri

resp = self.requests_session.post(url, data=params)
resp = self.requests_session.post(url, data=params, timeout=self.request_timeout)
resp.raise_for_status()

d = resp.json()
Expand Down