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

Remove JSON conversion from _util.check_request

Browse Source
This commit is contained in:
Mads Marquart
2019-07-02 16:40:56 +02:00
parent d17f741f97
commit 4fdf0bbc57
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fbchat/_client.py
View File

@@ -122,7 +122,8 @@ class Client(object):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._state._session.get(prefix_url(url), params=payload) r = self._state._session.get(prefix_url(url), params=payload)
try: try:
return check_request(r) content = check_request(r)
return to_json(content)
except FBchatFacebookError as e: except FBchatFacebookError as e:
if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): if error_retries > 0 and self._fix_fb_errors(e.fb_error_code):
return self._get(url, query=query, error_retries=error_retries - 1) return self._get(url, query=query, error_retries=error_retries - 1)
@@ -132,11 +133,11 @@ class Client(object):
payload = self._generatePayload(query) payload = self._generatePayload(query)
r = self._state._session.post(prefix_url(url), data=payload, files=files) r = self._state._session.post(prefix_url(url), data=payload, files=files)
try: try:
content = check_request(r)
if as_graphql: if as_graphql:
content = check_request(r, as_json=False)
return graphql_response_to_json(content) return graphql_response_to_json(content)
else: else:
return check_request(r) return to_json(content)
except FBchatFacebookError as e: except FBchatFacebookError as e:
if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): if error_retries > 0 and self._fix_fb_errors(e.fb_error_code):
return self._post( return self._post(

4
fbchat/_util.py
View File

@@ -156,11 +156,11 @@ def check_json(j):
handle_generic_error(j) handle_generic_error(j)
def check_request(r, as_json=True): def check_request(r):
check_http_code(r.status_code) check_http_code(r.status_code)
content = get_decoded_r(r) content = get_decoded_r(r)
check_content(content) check_content(content)
return to_json(content) if as_json else content return content
def check_http_code(code): def check_http_code(code):