Merge branch 'master' of https://marceln.org/git/Werk/lmwsip

.gitignore

@@ -1 +1,3 @@
 __pycache__
+lmwsip-test
+*.sip

lmwsip.py

@@ -107,7 +107,10 @@ send a sip command to the server
 
 recieve a answer from the sip server
 """
-        return(self._socket.recv(4096))
+        buf=""
+        while re.search("\r$", buf) == None:
+            buf += self._socket.recv(4096).decode('utf-8')
+        return(buf)
 
     def login(self):
         """login()
@@ -118,8 +121,8 @@ Raises a LmwLoginFailure exception on failure
         li="LI " + self.user + ","  + self.password + "\r"
         self.send(li)
         d = self.recv()
-        if (d.decode('ascii')[0] != '!'):
-            raise LmwLoginFailure(self.user + ":" + d.decode('ascii'))
+        if (d[0] != '!'):
+            raise LmwLoginFailure(self.user + ":" + d)
 
     def ti(self):
         """ti()
@@ -131,9 +134,9 @@ Raises a LmwCmdWarn of failure
         ti="TI " + self.meetnet + "\r"
         self.send(ti)
         d = self.recv()
-        if (d.decode('ascii')[0] != '!'):
-            raise LmwCmdWarn("TI " + self.meetnet +":" + d.decode('ascii'))
-        return (d.decode('ascii')[2:-1])
+        if (d('ascii')[0] != '!'):
+            raise LmwCmdWarn("TI " + self.meetnet +":" + d)
+        return (d[2:-1])
 
     def cmd(self, process, location, parameter, time_delta, day,
                                                 time_of_day, cmd_type="DATA"):
@@ -166,9 +169,9 @@ Returns:
 
         self.send(cmdstr)
         d = self.recv()
-        if (d.decode('ascii')[0] != '!'):
-            raise LmwCmdWarn(d.decode('ascii'))
-        return (d.decode('ascii')[2:-1])
+        if (d[0] != '!'):
+            raise LmwCmdWarn(d)
+        return (d[2:-1])
 
     def value(self, process, location, parameter, day = None,
                     time_of_day = None):

siprun

@@ -63,7 +63,7 @@ def main():
                 cmd = cmd.replace('\n', '\r')
                 print("> [%s]" % (cmd.strip('\r')))
                 lmwsip.send(cmd)
-                print("< [%s]" % (lmwsip.recv().decode('utf-8').strip('\r')))
+                print("< [%s]" % (lmwsip.recv().strip('\r')))
             f.close()
 
 if __name__ == "__main__":