1
0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00

use jc.utils for conversions

This commit is contained in:
Kelly Brazil
2021-04-18 16:33:47 -07:00
parent 1f034826f6
commit d36b332bd7
53 changed files with 193 additions and 271 deletions

View File

@ -119,7 +119,7 @@ import jc.utils
class info():
"""Provides parser metadata (version, author, etc.)"""
version = '1.2'
version = '1.3'
description = '`traceroute` and `traceroute6` command parser'
author = 'Kelly Brazil'
author_email = 'kellyjonbrazil@gmail.com'
@ -335,35 +335,21 @@ def _process(proc_data):
if 'hops' in proc_data:
for entry in proc_data['hops']:
for key in int_list:
if key in entry:
try:
entry[key] = int(entry[key])
except (ValueError, TypeError):
entry[key] = None
for key in entry:
if key in int_list:
entry[key] = jc.utils.convert_to_int(entry[key])
for key in float_list:
if key in entry:
try:
entry[key] = float(entry[key])
except (ValueError, TypeError):
entry[key] = None
if key in float_list:
entry[key] = jc.utils.convert_to_float(entry[key])
if 'probes' in entry:
for item in entry['probes']:
for key in int_list:
if key in item:
try:
item[key] = int(item[key])
except (ValueError, TypeError):
item[key] = None
for key in item:
if key in int_list:
item[key] = jc.utils.convert_to_int(item[key])
for key in float_list:
if key in item:
try:
item[key] = float(item[key])
except (ValueError, TypeError):
item[key] = None
if key in float_list:
item[key] = jc.utils.convert_to_float(item[key])
return proc_data