From 0ff3b43688619d0dd6eac1c3236a61401ee97c20 Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Sun, 28 Jan 2018 01:35:30 +0100 Subject: [PATCH] corrected json encoding to utf8 --- pyhamtools/lookuplib.py | 7 ++++--- pyhamtools/qsl.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pyhamtools/lookuplib.py b/pyhamtools/lookuplib.py index 881b10a..d055445 100644 --- a/pyhamtools/lookuplib.py +++ b/pyhamtools/lookuplib.py @@ -695,7 +695,7 @@ class LookupLib(object): if not self._check_html_response(response): raise LookupError - jsonLookup = json.loads(response.text, encoding='UTF-8') + jsonLookup = response.json() lookup = {} for item in jsonLookup: @@ -1385,7 +1385,7 @@ class LookupLib(object): mapping = None with open(country_mapping_filename, "r") as f: - mapping = json.loads(f.read(), encoding='UTF-8') + mapping = json.loads(f.read(),encoding='UTF-8') cty_list = plistlib.readPlist(cty_file) @@ -1473,7 +1473,8 @@ class LookupLib(object): Deserialize a JSON into a dictionary """ - my_dict = json.loads(json_data, encoding='UTF-8') + my_dict = json.loads(json_data.decode('utf8').replace("'", '"'), + encoding='UTF-8') for item in my_dict: if item == const.ADIF: diff --git a/pyhamtools/qsl.py b/pyhamtools/qsl.py index 99f6efe..ada2e26 100644 --- a/pyhamtools/qsl.py +++ b/pyhamtools/qsl.py @@ -119,7 +119,7 @@ def get_clublog_users(**kwargs): zip_file = zipfile.ZipFile(BytesIO(result.content)) files = zip_file.namelist() - cl_json_unzipped = zip_file.read(files[0]) + cl_json_unzipped = zip_file.read(files[0]).decode('utf8').replace("'", '"') cl_data = json.loads(cl_json_unzipped, encoding='UTF-8')