From 28e8c918712543b26e41736cb127e6f9e84ba4b2 Mon Sep 17 00:00:00 2001 From: Frisk Date: Sat, 22 May 2021 16:54:14 +0200 Subject: [PATCH] Transformed the main RC fetching function to use new API requesting function --- src/wiki.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/wiki.py b/src/wiki.py index 9d0d5a6..3114487 100644 --- a/src/wiki.py +++ b/src/wiki.py @@ -119,17 +119,14 @@ class Wiki(object): """Make a typical MW request for rc/abuselog If succeeds return the .json() of request and if not raises ConnectionError""" - request = self._safe_request(WIKI_API_PATH, params=self.construct_params(amount)) - if request is not None: - try: - request = request.json() - except ValueError: - logger.warning("ValueError in fetching changes") - logger.warning("Changes URL:" + request.url) - self.downtime_controller(True) - raise ConnectionError - return request - raise ConnectionError + try: + request = self.api_request(self.construct_params(amount)) + except (ServerError, MediaWikiError): + raise ConnectionError + except (ClientError, KeyError, BadRequest): + raise + return request + def construct_params(self, amount): """Constructs GET parameters for recentchanges/abuselog fetching feature"""