From 490e58a43c0140aaf588875205f384476fe83726 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Wed, 1 Jun 2016 21:38:02 +0200 Subject: [PATCH] Configtool: simplify board config parsing (a little bit). There should be no functional change. Mostly done for consistency with other, similar code sections. --- configtool/boardpanel.py | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index e1ef955..737ac12 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -293,27 +293,26 @@ class BoardPanel(wx.Panel): if self.parseCandidateValues(ln): continue - elif self.parseDefineValue(ln): + if self.parseDefineValue(ln): continue - else: - m = reDefTS.search(ln) - if m: - t = m.groups() - if len(t) == 1: - s = self.parseSensor(t[0]) - if s: - self.sensors.append(s) - continue + m = reDefTS.search(ln) + if m: + t = m.groups() + if len(t) == 1: + s = self.parseSensor(t[0]) + if s: + self.sensors.append(s) + continue - m = reDefHT.search(ln) - if m: - t = m.groups() - if len(t) == 1: - s = self.parseHeater(t[0]) - if s: - self.heaters.append(s) - continue + m = reDefHT.search(ln) + if m: + t = m.groups() + if len(t) == 1: + s = self.parseHeater(t[0]) + if s: + self.heaters.append(s) + continue # Parsing done. All parsed stuff is now in these arrays and dicts. # Uncomment for debugging.