some little improvements

boswatch/decoder/fms.py

@@ -27,7 +27,7 @@ class Fms:
     """!FMS decoder class
 
     This class decodes FMS data.
-    First step is to validate the data and check if the format is correct.
+    First step is to validate the data and _check if the format is correct.
     In the last step a valid BOSWatch packet is created and returned"""
 
     def __init__(self):

boswatch/decoder/pocsag.py

@@ -27,7 +27,7 @@ class Pocsag:
     """!POCSAG decoder class
 
     This class decodes POCSAG data.
-    First step is to validate the data and check if the format is correct.
+    First step is to validate the data and _check if the format is correct.
     In the last step a valid BOSWatch packet is created and returned"""
 
     def __init__(self):

boswatch/decoder/zvei.py

@@ -27,7 +27,7 @@ class Zvei:
     """!ZVEI decoder class
 
     This class decodes ZVEI data.
-    First step is to validate the data and check if the format is correct.
+    First step is to validate the data and _check if the format is correct.
     After that the double-tone-sign 'E' is replaced.
     In the last step a valid BOSWatch packet is created and returned"""
 

boswatch/filter/doubeFilter.py

@@ -53,9 +53,9 @@ class DoubleFilter:
 
         logging.debug("scanWord for '%s' is '%s'", bwPacket.get("mode"), scanWord)
 
-        return self.check(bwPacket, scanWord)
+        return self._check(bwPacket, scanWord)
 
-    def check(self, bwPacket, scanWord):
+    def _check(self, bwPacket, scanWord):
         self._filterLists[bwPacket.get("mode")].insert(0, bwPacket)
 
         # delete entrys that are to old

boswatch/network/server.py

@@ -21,10 +21,12 @@ import time
 
 logging.debug("- %s loaded", __name__)
 
-_dataPackets = []  # module wide global list for received data sets
+# module wide global list for received data sets
+_dataPackets = []
 _lockDataPackets = threading.Lock()
 
-_clients = {}
+# module wide global list for all currently connected clients
+_clients = {}  # _clients[ThreadName] = {"address", "timestamp"}
 _lockClients = threading.Lock()
 
 
@@ -138,7 +140,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
         return _clients
 
     @staticmethod
-    def getData():
+    def getDataFromQueue():
         """!Function to get the data packages from server
         must be polled by main program
 

boswatch/packet/packet.py

@@ -36,7 +36,7 @@ class Packet:
             logging.debug("create bwPacket from string")
             try:
                 self._packet = eval(str(bwPacket.strip()))
-            except:
+            except:  # pragma: no cover
                 # todo can we repair the packet anyway?
                 logging.exception("error while create packet from string")
 

test/test_ServerClient.py

@@ -149,10 +149,10 @@ class Test_ServerClient:
         # recv all
         assert self.testClient1.receive() == "[ack]"
         assert self.testClient2.receive() == "[ack]"
-        # check server output data
+        # _check server output data
-        assert useServer.getData()[1] == "test1"
+        assert useServer.getDataFromQueue()[1] == "test1"
-        assert useServer.getData()[1] == "test2"
+        assert useServer.getDataFromQueue()[1] == "test2"
-        assert useServer.getData() is None  # Last check must be None
+        assert useServer.getDataFromQueue() is None  # Last _check must be None
         # disconnect all
         assert self.testClient1.disconnect()
         assert self.testClient2.disconnect()