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

17
dmr_utils/utils.py
View File

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