Remove old inp in routine

api/s6_pumps.py

@@ -119,39 +119,9 @@ def delete_pump(name: str, cs: ChangeSet) -> ChangeSet:
 #   id  node1  node2  KEYWORD value {KEYWORD value ...} ;desc
 #   where KEYWORD = [POWER,HEAD,PATTERN,SPEED]
 #--------------------------------------------------------------
-class InpPump:
-    def __init__(self, line: str) -> None:
-        tokens = line.split()
-
-        num = len(tokens)
-        has_desc = tokens[-1].startswith(';')
-        num_without_desc = (num - 1) if has_desc else num
-
-        self.id = str(tokens[0])
-        self.node1 = str(tokens[1])
-        self.node2 = str(tokens[2])
-        self.props = {}
-        for i in range(3, num_without_desc, 2):
-            self.props |= { tokens[i].lower(): tokens[i + 1] }
-        self.power = float(self.props['power']) if 'power' in self.props else None
-        self.head = str(self.props['head']) if 'head' in self.props else None
-        self.speed = float(self.props['speed']) if 'speed' in self.props else None
-        self.pattern = str(self.props['pattern']) if 'pattern' in self.props else None
-        self.desc = str(tokens[-1]) if has_desc else None
 
 
-def inp_in_pump(section: list[str]) -> ChangeSet:
-    cs = ChangeSet()
-    for s in section:
-        # skip comment
-        if s.startswith(';'):
-            continue
-        obj = InpPump(s)
-        cs.append(g_add_prefix | {'type': 'pump', 'id': obj.id, 'node1': obj.node1, 'node2': obj.node2, 'power': obj.power, 'head': obj.head, 'speed': obj.speed, 'pattern': obj.pattern})
-    return cs
-
-
-def inp_in_pump_new(line: str) -> str:
+def inp_in_pump(line: str) -> str:
     tokens = line.split()
 
     num = len(tokens)