many file moves

boswatch/decoder/fmsdecoder.py

@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -50,7 +50,7 @@ class FmsDecoder:
             if re.search("[0-9a-f]{8}[0-9a-f][01]", fms_id):
                 logging.debug("found valid FMS")
 
-                bwPacket = packet.Packet()
+                bwPacket = Packet()
                 bwPacket.set("mode", "fms")
                 bwPacket.set("fms", fms_id)
                 bwPacket.set("service", service)

boswatch/decoder/pocsagdecoder.py

@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -48,7 +48,7 @@ class PocsagDecoder:
 
             logging.debug("found valid POCSAG")
 
-            bwPacket = packet.Packet()
+            bwPacket = Packet()
             bwPacket.set("mode", "pocsag")
             bwPacket.set("bitrate", bitrate)
             bwPacket.set("ric", ric)

boswatch/decoder/zveidecoder.py

@@ -18,7 +18,7 @@
 import logging
 import re
 
-from boswatch.packet import packet
+from boswatch.packet import Packet
 
 logging.debug("- %s loaded", __name__)
 
@@ -40,7 +40,7 @@ class ZveiDecoder:
         if re.search("[0-9E]{5}", data[7:12]):
             logging.debug("found valid ZVEI")
 
-            bwPacket = packet.Packet()
+            bwPacket = Packet()
             bwPacket.set("mode", "zvei")
             bwPacket.set("zvei", ZveiDecoder._solveDoubleTone(data[7:12]))
 

boswatch/packet/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-

boswatch/plugin/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-

boswatch/watchdog/__init__.py

@@ -1,2 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-

boswatch/worker/alarmWorker.py

@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-"""!
-    ____  ____  ______       __      __       __       _____
-   / __ )/ __ \/ ___/ |     / /___ _/ /______/ /_     |__  /
-  / __  / / / /\__ \| | /| / / __ `/ __/ ___/ __ \     /_ <
- / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / /   ___/ /
-/_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/   /____/
-                German BOS Information Script
-                     by Bastian Schroll
-
-@file:        alarmWorker.py
-@date:        20.09.2018
-@author:      Bastian Schroll
-@description: Alarm worker to process the alarms in a separate thread
-"""
-import logging
-
-# from boswatch.module import file
-
-logging.debug("- %s loaded", __name__)
-
-
-class alarmWorker:
-    """!Worker class to process alarms"""
-
-    def __init__(self, alarmQueue):
-        self.__alarmQueue = alarmQueue

bw_server.py

@@ -47,7 +47,7 @@ try:
     logging.debug("Import BOSWatch module")
     from boswatch.configYaml import ConfigYAML
     from boswatch.network.server import TCPServer
-    from boswatch.packet.packet import Packet
+    from boswatch.packet import Packet
     from boswatch.utils import header
     from boswatch.network.broadcast import BroadcastServer
 except:  # pragma: no cover

router_test.py

@@ -4,7 +4,7 @@
 import logging
 
 from boswatch.configYaml import ConfigYAML
-from boswatch.packet.packet import Packet
+from boswatch.packet import Packet
 
 import importlib
 import copy