From 8d237ea4ef8f10c59297d33172cddd6a62ed3f40 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Thu, 25 Jul 2019 20:33:20 +0200 Subject: [PATCH] Move body of Client._get to State --- fbchat/_client.py | 15 ++------------- fbchat/_state.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/fbchat/_client.py b/fbchat/_client.py index 708bf93..4aadc5f 100644 --- a/fbchat/_client.py +++ b/fbchat/_client.py @@ -108,19 +108,8 @@ class Client(object): INTERNAL REQUEST METHODS """ - def _get(self, url, params, error_retries=3): - params.update(self._state.get_params()) - r = self._state._session.get(prefix_url(url), params=params) - content = check_request(r) - j = to_json(content) - try: - handle_payload_error(j) - except FBchatPleaseRefresh: - if error_retries > 0: - self._state._do_refresh() - return self._get(url, params, error_retries=error_retries - 1) - raise - return j + def _get(self, url, params): + return self._state._get(url, params) def _post(self, url, data, files=None, as_graphql=False, error_retries=3): data.update(self._state.get_params()) diff --git a/fbchat/_state.py b/fbchat/_state.py index fd6e501..aec72a1 100644 --- a/fbchat/_state.py +++ b/fbchat/_state.py @@ -201,3 +201,17 @@ class State(object): self._revision = new._revision self._counter = new._counter self._logout_h = new._logout_h or self._logout_h + + def _get(self, url, params, error_retries=3): + params.update(self.get_params()) + r = self._session.get(_util.prefix_url(url), params=params) + content = _util.check_request(r) + j = _util.to_json(content) + try: + _util.handle_payload_error(j) + except _exception.FBchatPleaseRefresh: + if error_retries > 0: + self._do_refresh() + return self._get(url, params, error_retries=error_retries - 1) + raise + return j