dh1tw/pyhamtools
1
0
Fork 0
mirror of https://github.com/dh1tw/pyhamtools.git synced 2025-12-06 06:52:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrected json encoding to utf8

Browse source
This commit is contained in:
Tobias Wellnitz, DH1TW 2018-01-28 01:35:30 +01:00
parent 9c227ea70c
commit 0ff3b43688
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pyhamtools/lookuplib.py
View file

@ -695,7 +695,7 @@ class LookupLib(object):
if not self._check_html_response(response): if not self._check_html_response(response):
raise LookupError raise LookupError
jsonLookup = json.loads(response.text, encoding='UTF-8') jsonLookup = response.json()
lookup = {} lookup = {}
for item in jsonLookup: for item in jsonLookup:
@ -1385,7 +1385,7 @@ class LookupLib(object):
mapping = None mapping = None
with open(country_mapping_filename, "r") as f: 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) cty_list = plistlib.readPlist(cty_file)
@ -1473,7 +1473,8 @@ class LookupLib(object):
Deserialize a JSON into a dictionary 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: for item in my_dict:
if item == const.ADIF: if item == const.ADIF:

2
pyhamtools/qsl.py
View file

@ -119,7 +119,7 @@ def get_clublog_users(**kwargs):
zip_file = zipfile.ZipFile(BytesIO(result.content)) zip_file = zipfile.ZipFile(BytesIO(result.content))
files = zip_file.namelist() 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') cl_data = json.loads(cl_json_unzipped, encoding='UTF-8')