several smaller fixes

src/tmtccmd/ccsds/handler.py

@@ -1,5 +1,5 @@
 from typing import Callable, Dict, Optional, Tuple, List
-from abc import abstractmethod
+
 from tmtccmd.config.definitions import TmHandler, TmTypes, TelemetryQueueT
 from tmtccmd.sendreceive.tm_listener import QueueListT
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
@@ -12,7 +12,7 @@
 
 
 class CcsdsTmHandler(TmHandler):
-    def __init__(self, tmtc_printer: Optional[TmTcPrinter]=None):
+    def __init__(self, tmtc_printer: Optional[TmTcPrinter] = None):
         super().__init__(tm_type=TmTypes.CCSDS_SPACE_PACKETS)
         self._handler_dict: HandlerDictT = dict()
         self._tmtc_printer = tmtc_printer
@@ -35,13 +35,15 @@ def handle_packet_queues(self, packet_queue_list: QueueListT):
             handler_tuple = self._handler_dict.get(apid)
             if handler_tuple is not None:
                 ccsds_cb = handler_tuple[0]
-                self.handle_ccsds_packet_queue(apid=apid, packet_queue=queue_tuple[1], ccsds_cb=ccsds_cb)
+                self.handle_ccsds_packet_queue(
+                    apid=apid, packet_queue=queue_tuple[1], ccsds_cb=ccsds_cb
+                )
 
     def handle_ccsds_packet_queue(
-            self, apid: int, packet_queue: TelemetryQueueT, ccsds_cb: Optional[HandlerDictT] = None
+            self, apid: int, packet_queue: TelemetryQueueT,
+            ccsds_cb: Optional[HandlerDictT] = None
     ):
         for tm_packet in packet_queue:
             if ccsds_cb is None:
                 ccsds_cb = self._handler_dict[apid][0]
             ccsds_cb(apid, tm_packet, self._tmtc_printer)
-

src/tmtccmd/config/hook.py

@@ -7,7 +7,6 @@
 from tmtccmd.utility.logger import get_logger
 from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
-from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.pus_tc.definitions import TcQueueT
 from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.pus_tm.service_3_base import Service3Base

src/tmtccmd/pus_tm/handler.py

@@ -1,5 +1,3 @@
-from abc import abstractmethod
-
 from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.config.globals import get_global, CoreGlobalIds
 from tmtccmd.pus_tm.service_5_event import Service5TM
@@ -11,20 +9,20 @@
 LOGGER = get_logger()
 
 
-def default_ccsds_packet_handler(self, apid: int, packet: bytearray):
+def default_ccsds_packet_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
     """Default implementation only prints the packet"""
-    telemetry_packet = default_factory_hook(raw_tm_packet=packet)
-    tmtc_printer = get_global(CoreGlobalIds.TMTC_PRINTER_HANDLE)
-    tmtc_printer.print_telemetry(packet=telemetry_packet)
+    default_factory_hook(raw_tm_packet=raw_tm_packet, tmtc_printer=tmtc_printer)
 
 
-def default_factory_hook(raw_tm_packet: bytearray) -> PusTelemetry:
+def default_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
     service_type = raw_tm_packet[7]
     if service_type == 1:
-        return Service1TM(raw_tm_packet)
+        tm_packet = Service1TM(raw_tm_packet)
     if service_type == 5:
-        return Service5TM(raw_tm_packet)
+        tm_packet = Service5TM(raw_tm_packet)
     if service_type == 17:
-        return Service17TM(raw_tm_packet)
-    LOGGER.info("The service " + str(service_type) + " is not implemented in the default TM Factory function")
-    return PusTelemetry(raw_tm_packet)
+        tm_packet = Service17TM(raw_tm_packet)
+    if tm_packet is None:
+        LOGGER.info(f'The service {service_type} is not implemented in Telemetry Factory')
+        tm_packet = PusTelemetry(raw_tm_packet)
+    tmtc_printer.print_telemetry(packet=tm_packet)

src/tmtccmd/sendreceive/tm_listener.py

@@ -44,7 +44,7 @@ class ListenerModes(Enum):
 
     def __init__(
             self, com_if: CommunicationInterface, tm_timeout: float, tc_timeout_factor: float,
-            tm_type = TmTypes.CCSDS_SPACE_PACKETS
+            tm_type: TmTypes = TmTypes.CCSDS_SPACE_PACKETS
     ):
         """Initiate a TM listener
         :param com_if:              Type of communication interface, e.g. a serial or ethernet interface

src/tmtccmd/utility/conf_util.py

@@ -86,4 +86,4 @@ def acquire_timeout(lock, timeout):
     result = lock.acquire(timeout=timeout)
     yield result
     if result:
-        lock.release()
+        lock.release()