From 3f1eac88bee08cf8d79c2f53e57ad103a36bc8f7 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@dieschrollis.de>
Date: Tue, 18 Sep 2018 05:59:38 +0200
Subject: [PATCH 1/2] fixes for pyLint

---
 boswatch/filter/doubeFilter.py | 10 +++++-----
 boswatch/network/client.py     | 12 ++++++------
 boswatch/network/server.py     | 12 ++++++------
 boswatch/plugin/plugin.py      |  9 +++++----
 boswatch/utils/header.py       |  8 ++++----
 test/test_ServerClient.py      |  2 +-
 test/test_config.py            |  2 +-
 test/test_decoder.py           |  2 +-
 test/test_descriptor.py        |  2 +-
 test/test_doubleFilter.py      |  2 +-
 test/test_header.py            |  2 +-
 test/test_packet.py            |  2 +-
 test/test_paths.py             |  2 +-
 test/test_watchdog.py          |  2 +-
 14 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/boswatch/filter/doubeFilter.py b/boswatch/filter/doubeFilter.py
index 61e0640..066e18d 100644
--- a/boswatch/filter/doubeFilter.py
+++ b/boswatch/filter/doubeFilter.py
@@ -34,11 +34,11 @@ class DoubleFilter:
 
     def filter(self, bwPacket):
 
-        if bwPacket.get("mode") is "fms":
+        if bwPacket.get("mode") == "fms":
             scanWord = "fms"
-        elif bwPacket.get("mode") is "pocsag":
+        elif bwPacket.get("mode") == "pocsag":
             scanWord = "ric"
-        elif bwPacket.get("mode") is "zvei":
+        elif bwPacket.get("mode") == "zvei":
             scanWord = "zvei"
         else:
             logging.error("No Filter for '%s'", bwPacket)
@@ -59,8 +59,8 @@ class DoubleFilter:
         counter = 0
         for listPacket in self._filterLists[bwPacket.get("mode")][1:]:  # [1:] skip first entry, thats the new one
             if listPacket.get("timestamp") < (time.time() - self._config.getInt("doubleFilter", "IgnoreTime", "serverConfig")):
-                    self._filterLists[bwPacket.get("mode")].remove(listPacket)
-                    counter += 1
+                self._filterLists[bwPacket.get("mode")].remove(listPacket)
+                counter += 1
         if counter:
             logging.debug("%d old entry(s) removed", counter)
 
diff --git a/boswatch/network/client.py b/boswatch/network/client.py
index 9e719ce..c0eac72 100644
--- a/boswatch/network/client.py
+++ b/boswatch/network/client.py
@@ -45,16 +45,16 @@ class TCPClient:
             self._sock.setdefaulttimeout(self._timeout)
             self._sock = socket.create_connection((host, port))
 
-            logging.debug("connected to " + str(host) + ":" + str(port))
+            logging.debug("connected to %s:%s", host, port)
             return True
         except ConnectionRefusedError:
-            logging.error("cannot connect to %s:%s - connection refused", str(host), str(port))
+            logging.error("cannot connect to %s:%s - connection refused", host, port)
             return False
         except socket.timeout:  # pragma: no cover
-            logging.warning("cannot connect to %s:%s - timeout after %s sec", str(host), str(port), self._timeout)
+            logging.warning("cannot connect to %s:%s - timeout after %s sec", host, port, self._timeout)
             return False
         except:  # pragma: no cover
-            logging.exception("cannot connect to %s:%s", str(host), str(port))
+            logging.exception("cannot connect to %s:%s", host, port)
             return False
 
     def disconnect(self):
@@ -78,7 +78,7 @@ class TCPClient:
         @param data: data to send to the server
         @return True or False"""
         try:
-            logging.debug("transmitting: " + data)
+            logging.debug("transmitting: %s", data)
             self._sock.sendall(bytes(data + "\n", "utf-8"))
             logging.debug("transmitted...")
             return True
@@ -98,7 +98,7 @@ class TCPClient:
         @return received data"""
         try:
             received = str(self._sock.recv(1024), "utf-8")
-            logging.debug("received: " + received)
+            logging.debug("received: %d", received)
             return received
         except AttributeError:
             logging.error("cannot receive - no connection established")
diff --git a/boswatch/network/server.py b/boswatch/network/server.py
index 6fc8d33..9dd6567 100644
--- a/boswatch/network/server.py
+++ b/boswatch/network/server.py
@@ -48,8 +48,8 @@ class TCPHandler(socketserver.BaseRequestHandler):
         try:
             while data:
                 data = str(self.request.recv(1024).strip(), 'utf-8')
-                if data is not "":
-                    logging.debug(req_name + " recv: " + data)
+                if data != "":
+                    logging.debug("%s recv: %s", req_name, data)
 
                     # add a new entry at first position (index 0) with client IP
                     # and the decoded data dict as an string in utf-8 and an timestamp
@@ -57,14 +57,14 @@ class TCPHandler(socketserver.BaseRequestHandler):
                         _dataPackets.insert(0, (self.client_address[0], data, time.time()))  # time() to calc time in queue
                     logging.debug("Add data to queue")
 
-                    logging.debug(req_name + " send: [ack]")
+                    logging.debug("%s send: [ack]", req_name)
                     self.request.sendall(bytes("[ack]", "utf-8"))
             self.request.close()
 
         except (ConnectionResetError, ConnectionAbortedError):  # pragma: no cover
-            logging.debug(req_name + " connection closed")
+            logging.debug("%s connection closed", req_name)
         except:  # pragma: no cover
-            logging.exception(req_name + " error while receiving")
+            logging.exception("%s error while receiving", req_name)
         finally:
             with _lockClients:
                 del _clients[threading.current_thread().name]
@@ -100,7 +100,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
             self._server_thread.name = "Thread-BWServer"
             self._server_thread.daemon = True
             self._server_thread.start()
-            logging.debug("TCPServer started in Thread: " + self._server_thread.name)
+            logging.debug("TCPServer started in Thread: %s", self._server_thread.name)
             return True
         except OSError:
             logging.exception("server always running?")
diff --git a/boswatch/plugin/plugin.py b/boswatch/plugin/plugin.py
index ce47a22..73a4427 100644
--- a/boswatch/plugin/plugin.py
+++ b/boswatch/plugin/plugin.py
@@ -43,6 +43,7 @@ class Plugin:
         self._setupTime = 0
         self._alarmTime = 0
         self._teardownTime = 0
+        self._endTime = 0
         self._tmpTime = 0
 
         # for statistics
@@ -89,16 +90,16 @@ class Plugin:
         self._tmpTime = time.time()
         try:
 
-            if bwPacket.get("mode") is "fms":
+            if bwPacket.get("mode") == "fms":
                 logging.debug("[%s] fms()", self._pluginName)
                 self.fms(bwPacket)
-            if bwPacket.get("mode") is "pocsag":
+            if bwPacket.get("mode") == "pocsag":
                 logging.debug("[%s] pocsag()", self._pluginName)
                 self.pocsag(bwPacket)
-            if bwPacket.get("mode") is "zvei":
+            if bwPacket.get("mode") == "zvei":
                 logging.debug("[%s] zvei()", self._pluginName)
                 self.zvei(bwPacket)
-            if bwPacket.get("mode") is "msg":
+            if bwPacket.get("mode") == "msg":
                 logging.debug("[%s] msg()", self._pluginName)
                 self.msg(bwPacket)
         except:
diff --git a/boswatch/utils/header.py b/boswatch/utils/header.py
index 3fad926..201beb9 100644
--- a/boswatch/utils/header.py
+++ b/boswatch/utils/header.py
@@ -61,10 +61,10 @@ def infoToLog():
                       boswatch.version.date["day"],
                       boswatch.version.date["month"],
                       boswatch.version.date["year"])
-        logging.debug("- Python version:   " + platform.python_version())
-        logging.debug("- Python build:     " + str(platform.python_build()))
-        logging.debug("- System:           " + platform.system())
-        logging.debug("- OS Version:       " + platform.platform())
+        logging.debug("- Python version:   %s", platform.python_version())
+        logging.debug("- Python build:     %s", platform.python_build())
+        logging.debug("- System:           %s", platform.system())
+        logging.debug("- OS Version:       %s", platform.platform())
         logging.debug("")
         return True
     except:  # pragma: no cover
diff --git a/test/test_ServerClient.py b/test/test_ServerClient.py
index 3dbf0fa..b54c22e 100644
--- a/test/test_ServerClient.py
+++ b/test/test_ServerClient.py
@@ -26,7 +26,7 @@ class Test_ServerClient:
     """!Unittest for the server/client environment"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     @pytest.fixture(scope="function")
     def useServer(self):
diff --git a/test/test_config.py b/test/test_config.py
index 5b638c1..e3bc6d3 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -24,7 +24,7 @@ class Test_Config:
     """!Unittests for the config"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_loadLocalConfig(self):
         """!load a local config file"""
diff --git a/test/test_decoder.py b/test/test_decoder.py
index d7ff761..bdb0fd5 100644
--- a/test/test_decoder.py
+++ b/test/test_decoder.py
@@ -23,7 +23,7 @@ class Test_Decoder:
     """!Unittests for the decoder"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_decoderNoData(self):
         """!Test a empty string"""
diff --git a/test/test_descriptor.py b/test/test_descriptor.py
index c2f9e7b..0e8c328 100644
--- a/test/test_descriptor.py
+++ b/test/test_descriptor.py
@@ -25,7 +25,7 @@ class Test_Descriptor:
     """!Unittests for the descriptor"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_loadCsvNotExist(self):
         """!read CSV file where not exist direct per DescriptionList class"""
diff --git a/test/test_doubleFilter.py b/test/test_doubleFilter.py
index 93e4c07..4557ed5 100644
--- a/test/test_doubleFilter.py
+++ b/test/test_doubleFilter.py
@@ -22,7 +22,7 @@ import boswatch.filter.doubeFilter
 class Test_DoubleFilter:
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_none(self):
         pass
diff --git a/test/test_header.py b/test/test_header.py
index 62744af..baf24f4 100644
--- a/test/test_header.py
+++ b/test/test_header.py
@@ -23,7 +23,7 @@ class Test_Header:
     """!Unittests for the header"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_logoToLog(self):
         """!Test logo to log"""
diff --git a/test/test_packet.py b/test/test_packet.py
index df80f96..6d64816 100644
--- a/test/test_packet.py
+++ b/test/test_packet.py
@@ -24,7 +24,7 @@ class Test_Packet:
     """!Unittests for the BOSWatch packet"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     @pytest.fixture(scope="function")
     def buildPacket(self):
diff --git a/test/test_paths.py b/test/test_paths.py
index 38850a2..b1c5782 100644
--- a/test/test_paths.py
+++ b/test/test_paths.py
@@ -24,7 +24,7 @@ class Test_Config:
     """!Unittests for the paths"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_fileExists(self):
         """!load a local config file"""
diff --git a/test/test_watchdog.py b/test/test_watchdog.py
index cfcf14e..686accf 100644
--- a/test/test_watchdog.py
+++ b/test/test_watchdog.py
@@ -22,7 +22,7 @@ import logging
 class Test_Watchdog:
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s" % (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
 
     def test_none(self):
         pass

From 3c7489e37e64bbd9f310148b5567e7eb56bcefce Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@dieschrollis.de>
Date: Tue, 18 Sep 2018 06:05:24 +0200
Subject: [PATCH 2/2] fix little error

---
 test/test_ServerClient.py | 2 +-
 test/test_config.py       | 2 +-
 test/test_decoder.py      | 2 +-
 test/test_descriptor.py   | 2 +-
 test/test_doubleFilter.py | 2 +-
 test/test_header.py       | 2 +-
 test/test_packet.py       | 2 +-
 test/test_paths.py        | 2 +-
 test/test_watchdog.py     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/test_ServerClient.py b/test/test_ServerClient.py
index b54c22e..48b030c 100644
--- a/test/test_ServerClient.py
+++ b/test/test_ServerClient.py
@@ -26,7 +26,7 @@ class Test_ServerClient:
     """!Unittest for the server/client environment"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     @pytest.fixture(scope="function")
     def useServer(self):
diff --git a/test/test_config.py b/test/test_config.py
index e3bc6d3..4868317 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -24,7 +24,7 @@ class Test_Config:
     """!Unittests for the config"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_loadLocalConfig(self):
         """!load a local config file"""
diff --git a/test/test_decoder.py b/test/test_decoder.py
index bdb0fd5..11f0ba6 100644
--- a/test/test_decoder.py
+++ b/test/test_decoder.py
@@ -23,7 +23,7 @@ class Test_Decoder:
     """!Unittests for the decoder"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_decoderNoData(self):
         """!Test a empty string"""
diff --git a/test/test_descriptor.py b/test/test_descriptor.py
index 0e8c328..f725b09 100644
--- a/test/test_descriptor.py
+++ b/test/test_descriptor.py
@@ -25,7 +25,7 @@ class Test_Descriptor:
     """!Unittests for the descriptor"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_loadCsvNotExist(self):
         """!read CSV file where not exist direct per DescriptionList class"""
diff --git a/test/test_doubleFilter.py b/test/test_doubleFilter.py
index 4557ed5..d1f2ec9 100644
--- a/test/test_doubleFilter.py
+++ b/test/test_doubleFilter.py
@@ -22,7 +22,7 @@ import boswatch.filter.doubeFilter
 class Test_DoubleFilter:
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_none(self):
         pass
diff --git a/test/test_header.py b/test/test_header.py
index baf24f4..5ca4216 100644
--- a/test/test_header.py
+++ b/test/test_header.py
@@ -23,7 +23,7 @@ class Test_Header:
     """!Unittests for the header"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_logoToLog(self):
         """!Test logo to log"""
diff --git a/test/test_packet.py b/test/test_packet.py
index 6d64816..f311a22 100644
--- a/test/test_packet.py
+++ b/test/test_packet.py
@@ -24,7 +24,7 @@ class Test_Packet:
     """!Unittests for the BOSWatch packet"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     @pytest.fixture(scope="function")
     def buildPacket(self):
diff --git a/test/test_paths.py b/test/test_paths.py
index b1c5782..d8891a8 100644
--- a/test/test_paths.py
+++ b/test/test_paths.py
@@ -24,7 +24,7 @@ class Test_Config:
     """!Unittests for the paths"""
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_fileExists(self):
         """!load a local config file"""
diff --git a/test/test_watchdog.py b/test/test_watchdog.py
index 686accf..5a1496b 100644
--- a/test/test_watchdog.py
+++ b/test/test_watchdog.py
@@ -22,7 +22,7 @@ import logging
 class Test_Watchdog:
 
     def setup_method(self, method):
-        logging.debug("[TEST] %s.%s", (type(self).__name__, method.__name__))
+        logging.debug("[TEST] %s.%s", type(self).__name__, method.__name__)
 
     def test_none(self):
         pass