ShaYmez/dmr_utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Added json and dictionary checking to eliminate terminations when the DMR-MARC database can't download."

Browse Source 
This reverts commit 192d36a94c.
This commit is contained in:
Cort Buffington 2018-04-16 08:36:59 -05:00
parent bbd5a90eff
commit 2d971a2950
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dmr_utils/utils.py
View File

@ -22,7 +22,6 @@ from __future__ import print_function
import json import json
from os.path import isfile, getmtime from os.path import isfile, getmtime
from os import remove
from time import time from time import time
from urllib import URLopener from urllib import URLopener
from csv import reader as csv_reader from csv import reader as csv_reader
@ -115,13 +114,7 @@ def mk_id_dict(_path, _file):
if _file.endswith(('.json','.JSON')): if _file.endswith(('.json','.JSON')):
try: try:
with open(_path+_file, 'rU') as _handle: with open(_path+_file, 'rU') as _handle:
ids = json.loads(_handle.read().decode('utf-8', 'ignore'))
try:
ids = json.loads(_handle.read().decode('utf-8', 'ignore'))
except (ValueError):
remove(_path+_file)
return dict
if 'repeaters' in ids: if 'repeaters' in ids:
ids = ids['repeaters'] ids = ids['repeaters']
id_type = 'locator' id_type = 'locator'
@ -137,13 +130,9 @@ def mk_id_dict(_path, _file):
else: else:
return dict return dict
try: for row in range(len(ids)):
for row in range(len(ids)): dict[int(ids[row][id_type])] = ids[row][id_value].encode('ascii','ignore')
dict[int(ids[row][id_type])] = ids[row][id_value].encode('ascii','ignore')
except (ValueError, KeyError):
remove(_path+_file)
return dict;
_handle.close _handle.close
return dict return dict
except IOError: except IOError:
@ -206,4 +195,4 @@ def get_alias(_id, _dict, *args):
return _id return _id
# FOR LEGACY PURPOSES # FOR LEGACY PURPOSES
get_info = get_alias get_info = get_alias