X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fdata%2Fprocessing%2Fping%2Fparser.py;fp=src%2Fnepi%2Fdata%2Fprocessing%2Fping%2Fparser.py;h=d531118b4a7cbeb987c960d31f48fd290da35ba7;hb=bb6985326609602a117e65822ada42f2685c1a36;hp=b2b9a946193b3ea25b2805542763d6e6ee330698;hpb=b4af9a40867beff8660612fe20d3838cb375f159;p=nepi.git diff --git a/src/nepi/data/processing/ping/parser.py b/src/nepi/data/processing/ping/parser.py index b2b9a946..d531118b 100644 --- a/src/nepi/data/processing/ping/parser.py +++ b/src/nepi/data/processing/ping/parser.py @@ -39,29 +39,27 @@ def parse_file(filename): """ - f = open(filename, "r") + with open(filename, "r") as f: - # Traceroute info - target_ip = None - target_hostname = None + # Traceroute info + target_ip = None + target_hostname = None - data = [] - - for line in f: - # match traceroute to ... - m = re.match(_rre, line) - if not m: - continue - - target_ip = m.groupdict()["ip"] - # FIX THIS: Make sure the regular expression does not inlcude - # the ')' in the ip group - target_ip = target_ip.replace(")","") - target_hostname = m.groupdict()["hostname"] - time = m.groupdict()["time"] - data.append((target_ip, target_hostname, time)) - - f.close() + data = [] + + for line in f: + # match traceroute to ... + m = re.match(_rre, line) + if not m: + continue + + target_ip = m.groupdict()["ip"] + # FIX THIS: Make sure the regular expression does not inlcude + # the ')' in the ip group + target_ip = target_ip.replace(")","") + target_hostname = m.groupdict()["hostname"] + time = m.groupdict()["time"] + data.append((target_ip, target_hostname, time)) return data