From f0c6e8612f8f05aa47aa681483bb4c51b037264f Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Thu, 21 Sep 2017 10:09:48 +0200 Subject: [PATCH] Fixed typo and made name more generic --- fbchat/client.py | 10 +++++----- fbchat/utils.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fbchat/client.py b/fbchat/client.py index 6416b88..6552287 100644 --- a/fbchat/client.py +++ b/fbchat/client.py @@ -92,7 +92,7 @@ class Client(object): self.req_counter += 1 return payload - def _fix_1357004(self, error_code): + def _fix_fb_errors(self, error_code): """ This fixes "Please try closing and re-opening your browser window" errors (1357004) This error usually happens after 1-2 days of inactivity @@ -112,7 +112,7 @@ class Client(object): try: return check_request(r, as_json=as_json) except FBchatFacebookError as e: - if error_retries > 0 and self._fix_1357004(e.fb_error_code): + if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): return self._get(url, query=query, timeout=timeout, fix_request=fix_request, as_json=as_json, error_retries=error_retries-1) raise e @@ -124,7 +124,7 @@ class Client(object): try: return check_request(r, as_json=as_json) except FBchatFacebookError as e: - if error_retries > 0 and self._fix_1357004(e.fb_error_code): + if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): return self._post(url, query=query, timeout=timeout, fix_request=fix_request, as_json=as_json, error_retries=error_retries-1) raise e @@ -133,7 +133,7 @@ class Client(object): try: return graphql_response_to_json(content) except FBchatFacebookError as e: - if error_retries > 0 and self._fix_1357004(e.fb_error_code): + if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): return self._graphql(payload, error_retries=error_retries-1) raise e @@ -154,7 +154,7 @@ class Client(object): try: return check_request(r, as_json=as_json) except FBchatFacebookError as e: - if error_retries > 0 and self._fix_1357004(e.fb_error_code): + if error_retries > 0 and self._fix_fb_errors(e.fb_error_code): return self._postFile(url, files=files, query=query, timeout=timeout, fix_request=fix_request, as_json=as_json, error_retries=error_retries-1) raise e diff --git a/fbchat/utils.py b/fbchat/utils.py index 8f49f26..7d3434b 100644 --- a/fbchat/utils.py +++ b/fbchat/utils.py @@ -165,7 +165,7 @@ def check_json(j): def check_request(r, as_json=True): if not r.ok: - raise FBchatFacebookError('Error when sending request: Got {} response'.format(r.status_code), request_error_code=r.status_code) + raise FBchatFacebookError('Error when sending request: Got {} response'.format(r.status_code), request_status_code=r.status_code) content = get_decoded_r(r)