diff --git a/Makefile b/Makefile index e3c74d7..1f3eff6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -UTIL_VERSION := 0.2.7 +UTIL_VERSION := 0.2.8 UTIL_NAME := codeplag PWD := $(shell pwd) diff --git a/src/webparsers/github_parser.py b/src/webparsers/github_parser.py index 592465a..e808897 100644 --- a/src/webparsers/github_parser.py +++ b/src/webparsers/github_parser.py @@ -58,6 +58,7 @@ def send_get_request( # Recommended 'accept': 'application/vnd.github.v3+json' } + url = address + api_url if self.__access_token != '': headers.update({ 'Authorization': 'token ' + self.__access_token, @@ -65,8 +66,7 @@ def send_get_request( # Check Ethernet connection and requests limit try: - response = requests.get(address + api_url, headers=headers, - params=params) + response = requests.get(url, headers=headers, params=params) except requests.exceptions.ConnectionError as err: self.logger.error( "Connection error. Please check the Internet connection." @@ -74,19 +74,16 @@ def send_get_request( self.logger.debug(str(err)) sys.exit(1) - if response.status_code == 403: - if 'message' in response.json(): - self.logger.error( - "GitHub " + response.json()['message'] - ) - sys.exit(1) - - raise KeyError + if response.status_code in [400, 403, 404]: + self.logger.error( + f"GitHub error: '{response.json()['message']}' for url '{url}'." + ) + sys.exit(1) try: response.raise_for_status() except requests.exceptions.HTTPError as err: - self.logger.error("The access token is bad") + self.logger.error("The access token is bad.") self.logger.debug(str(err)) sys.exit(1)