From 7af284a92f9b22014dd70acf0b5ea7d55897be26 Mon Sep 17 00:00:00 2001 From: Victor Fors Date: Sat, 9 Apr 2022 00:10:21 +0200 Subject: [PATCH] wikipedia --- wikipedia | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wikipedia b/wikipedia index 5866e59..f9b695b 100755 --- a/wikipedia +++ b/wikipedia @@ -2,24 +2,28 @@ import requests import sys import textwrap +try: + from simplejson.errors import JSONDecodeError +except ImportError: + from json.decoder import JSONDecodeError # Fetch JSON from url and run it through transform, pretty printing errors # and the data worked on as exhaustively as possible. def json_query(url, transform, params={}): try: result = requests.get(url, params) - except ConnectionError: + except requests.exceptions.ConnectionError: print("Network connection error.") sys.exit(1) try: data = result.json() except JSONDecodeError as err: - print('Error when decoding JSON:\nFrom endpoint ' + url + ':\n' + err + '\n' + result + '\n') + print('Error when decoding JSON:\nFrom endpoint ' + url + ':\n' + str(err) + '\n' + str(result) + '\n') sys.exit(1) try: return transform(data) except (IndexError, KeyError) as err: - print('Error when traversing JSON:\nFrom endpoint ' + url + ':\n' + err) + print('Error when traversing JSON:\nFrom endpoint ' + url + ':\n' + str(err)) pprint.PrettyPrinter(indent=2).pprint(data) sys.exit(1)