karaolidis/fbchat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant timeout parameter

Browse Source
This commit is contained in:
Mads Marquart
2019-05-23 19:38:20 +02:00
parent faa0383af3
commit bb2afe8e40
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fbchat/_client.py
View File

@@ -128,22 +128,10 @@ class Client(object):
return True return True
return False return False
def _get( def _get(self, url, query=None, fix_request=False, as_json=False, error_retries=3):
self,
url,
query=None,
timeout=30,
fix_request=False,
as_json=False,
error_retries=3,
):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._session.get( r = self._session.get(
url, url, headers=self._header, params=payload, verify=self.ssl_verify
headers=self._header,
params=payload,
timeout=timeout,
verify=self.ssl_verify,
) )
if not fix_request: if not fix_request:
return r return r
@@ -154,7 +142,6 @@ class Client(object):
return self._get( return self._get(
url, url,
query=query, query=query,
timeout=timeout,
fix_request=fix_request, fix_request=fix_request,
as_json=as_json, as_json=as_json,
error_retries=error_retries - 1, error_retries=error_retries - 1,
@@ -165,7 +152,6 @@ class Client(object):
self, self,
url, url,
query=None, query=None,
timeout=30,
fix_request=False, fix_request=False,
as_json=False, as_json=False,
as_graphql=False, as_graphql=False,
@@ -173,11 +159,7 @@ class Client(object):
): ):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._session.post( r = self._session.post(
url, url, headers=self._header, data=payload, verify=self.ssl_verify
headers=self._header,
data=payload,
timeout=timeout,
verify=self.ssl_verify,
) )
if not fix_request: if not fix_request:
return r return r
@@ -192,7 +174,6 @@ class Client(object):
return self._post( return self._post(
url, url,
query=query, query=query,
timeout=timeout,
fix_request=fix_request, fix_request=fix_request,
as_json=as_json, as_json=as_json,
as_graphql=as_graphql, as_graphql=as_graphql,
@@ -200,24 +181,19 @@ class Client(object):
) )
raise e raise e
def _cleanGet(self, url, query=None, timeout=30, allow_redirects=True): def _cleanGet(self, url, query=None, allow_redirects=True):
return self._session.get( return self._session.get(
url, url,
headers=self._header, headers=self._header,
params=query, params=query,
timeout=timeout,
verify=self.ssl_verify, verify=self.ssl_verify,
allow_redirects=allow_redirects, allow_redirects=allow_redirects,
) )
def _cleanPost(self, url, query=None, timeout=30): def _cleanPost(self, url, query=None):
self._req_counter += 1 self._req_counter += 1
return self._session.post( return self._session.post(
url, url, headers=self._header, data=query, verify=self.ssl_verify
headers=self._header,
data=query,
timeout=timeout,
verify=self.ssl_verify,
) )
def _postFile( def _postFile(
@@ -225,7 +201,6 @@ class Client(object):
url, url,
files=None, files=None,
query=None, query=None,
timeout=30,
fix_request=False, fix_request=False,
as_json=False, as_json=False,
error_retries=3, error_retries=3,
@@ -236,12 +211,7 @@ class Client(object):
(i, self._header[i]) for i in self._header if i != "Content-Type" (i, self._header[i]) for i in self._header if i != "Content-Type"
) )
r = self._session.post( r = self._session.post(
url, url, headers=headers, data=payload, files=files, verify=self.ssl_verify
headers=headers,
data=payload,
timeout=timeout,
files=files,
verify=self.ssl_verify,
) )
if not fix_request: if not fix_request:
return r return r
@@ -253,7 +223,6 @@ class Client(object):
url, url,
files=files, files=files,
query=query, query=query,
timeout=timeout,
fix_request=fix_request, fix_request=fix_request,
as_json=as_json, as_json=as_json,
error_retries=error_retries - 1, error_retries=error_retries - 1,
@@ -500,7 +469,6 @@ class Client(object):
""" """
Safely logs out the client Safely logs out the client
:param timeout: See `requests timeout <http://docs.python-requests.org/en/master/user/advanced/#timeouts>`_
:return: True if the action was successful :return: True if the action was successful
:rtype: bool :rtype: bool
""" """