From f11576a9ae55ce391908dcdcf44b1ae814620d71 Mon Sep 17 00:00:00 2001 From: Brian ONeill Date: Mon, 3 May 2021 15:34:48 -0700 Subject: [PATCH] Fix file parsing with unexpected newlines closes #59 --- canopen_monitor/__init__.py | 2 +- canopen_monitor/parse/eds.py | 5 +++++ tests/__init__.py | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/canopen_monitor/__init__.py b/canopen_monitor/__init__.py index 6a4401d..acaa3b2 100755 --- a/canopen_monitor/__init__.py +++ b/canopen_monitor/__init__.py @@ -2,7 +2,7 @@ MAJOR = 3 MINOR = 3 -PATCH = 0 +PATCH = 1 APP_NAME = 'canopen-monitor' APP_DESCRIPTION = 'An NCurses-based TUI application for tracking activity' \ diff --git a/canopen_monitor/parse/eds.py b/canopen_monitor/parse/eds.py index 9c573db..933c3a3 100644 --- a/canopen_monitor/parse/eds.py +++ b/canopen_monitor/parse/eds.py @@ -145,6 +145,11 @@ def __init__(self, eds_data: [str]): prev = 0 for i, line in enumerate(eds_data): if line == '': + # Handle extra empty strings + if prev == i: + prev = i + 1 + continue + section = eds_data[prev:i] id = section[0][1:-1].split('sub') diff --git a/tests/__init__.py b/tests/__init__.py index 6515a5b..fc5c6ea 100755 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -7738,6 +7738,7 @@ ParameterValue= PDOMapping=0 + [3100sub9] ParameterName=Get apt list output Denotation= @@ -7748,4 +7749,5 @@ DefaultValue= ParameterValue= PDOMapping=0 + """ \ No newline at end of file