remove asserts + other PR feedback

Author: FoamyGuy

adafruit_midi/__init__.py

@@ -26,7 +26,7 @@
 
 """
 try:
-    from typing import Union, Tuple, Any, List, Optional, Dict
+    from typing import Union, Tuple, Any, List, Optional, Dict, BinaryIO
 except ImportError:
     pass
 
@@ -58,8 +58,8 @@ class MIDI:
 
     def __init__(
         self,
-        midi_in: Optional[Any] = None,
-        midi_out: Optional[Any] = None,
+        midi_in: Optional[BinaryIO] = None,
+        midi_out: Optional[BinaryIO] = None,
         *,
         in_channel: Optional[Union[int, Tuple[int, ...]]] = None,
         out_channel: int = 0,
@@ -109,8 +109,7 @@ def out_channel(self) -> int:
         return self._out_channel
 
     @out_channel.setter
-    def out_channel(self, channel: Optional[int]) -> None:
-        assert channel is not None
+    def out_channel(self, channel: int) -> None:
         if not 0 <= channel <= 15:
             raise RuntimeError("Invalid output channel")
         self._out_channel = channel
@@ -126,7 +125,6 @@ def receive(self) -> Optional[MIDIMessage]:
         # If the buffer here is not full then read as much as we can fit from
         # the input port
         if len(self._in_buf) < self._in_buf_size:
-            assert self._midi_in is not None
             bytes_in = self._midi_in.read(self._in_buf_size - len(self._in_buf))
             if bytes_in:
                 if self._debug:
@@ -174,5 +172,4 @@ def send(self, msg: MIDIMessage, channel: Optional[int] = None) -> None:
     def _send(self, packet: bytes, num: int) -> None:
         if self._debug:
             print("Sending: ", [hex(i) for i in packet[:num]])
-        assert self._midi_out is not None
         self._midi_out.write(packet, num)

adafruit_midi/midi_message.py

@@ -132,13 +132,10 @@ def register_message_type(cls) -> None:
         ### These must be inserted with more specific masks first
         insert_idx = len(MIDIMessage._statusandmask_to_class)
         for idx, m_type in enumerate(MIDIMessage._statusandmask_to_class):
-            assert cls._STATUSMASK is not None
             if cls._STATUSMASK > m_type[0][1]:
                 insert_idx = idx
                 break
 
-        assert cls._STATUS is not None
-        assert cls._STATUSMASK is not None
         MIDIMessage._statusandmask_to_class.insert(
             insert_idx, ((cls._STATUS, cls._STATUSMASK), cls)
         )
@@ -147,8 +144,8 @@ def register_message_type(cls) -> None:
     @classmethod
     def _search_eom_status(
         cls,
-        buf: Dict[int, bool],
-        eom_status: bool,
+        buf: bytearray,
+        eom_status: Optional[int],
         msgstartidx: int,
         msgendidxplusone: int,
         endidx: int,
@@ -177,15 +174,14 @@ def _search_eom_status(
     @classmethod
     def _match_message_status(
         cls, buf: bytearray, msgstartidx: int, msgendidxplusone: int, endidx: int
-    ) -> Tuple[Optional[Any], bool, bool, bool, bool, int]:
+    ) -> Tuple[Optional[Any], int, bool, bool, bool, int]:
         msgclass = None
         status = buf[msgstartidx]
         known_msg = False
         complete_msg = False
         bad_termination = False
 
         # Rummage through our list looking for a status match
-        assert msgclass is not None
         for status_mask, msgclass in MIDIMessage._statusandmask_to_class:
             masked_status = status & status_mask[1]
             if status_mask[0] == masked_status:
@@ -265,7 +261,6 @@ def from_message_bytes(
             channel_match_orna = True
             if complete_message and not bad_termination:
                 try:
-                    assert msgclass is not None
                     msg = msgclass.from_bytes(midibytes[msgstartidx:msgendidxplusone])
                     if msg.channel is not None:
                         channel_match_orna = channel_filter(msg.channel, channel_in)
@@ -299,7 +294,6 @@ def from_message_bytes(
     def __bytes__(self) -> bytes:
         """Return the ``bytes`` wire protocol representation of the object
         with channel number applied where appropriate."""
-        assert self._STATUS is not None
         return bytes([self._STATUS])
 
     # databytes value present to keep interface uniform but unused
@@ -312,7 +306,7 @@ def from_bytes(cls, msg_bytes: bytes) -> "MIDIMessage":
         representation of the MIDI message."""
         return cls()
 
-    def __str__(self):
+    def __str__(self) -> str:
         """Print an instance"""
         cls = self.__class__
         if slots := getattr(cls, "_message_slots", None):