Merge branch 'refs/heads/main' into type_annotations

# Conflicts:
#	adafruit_midi/midi_message.py

Author: FoamyGuy

.pre-commit-config.yaml

@@ -4,21 +4,21 @@
 
 repos:
   - repo: https://github.com/python/black
-    rev: 22.3.0
+    rev: 23.3.0
     hooks:
       - id: black
   - repo: https://github.com/fsfe/reuse-tool
-    rev: v0.14.0
+    rev: v1.1.2
     hooks:
       - id: reuse
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/pylint
-    rev: v2.15.5
+    rev: v2.17.4
     hooks:
       - id: pylint
         name: pylint (library code)

.pylintrc

@@ -396,4 +396,4 @@ min-public-methods=1
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "Exception"
-overgeneral-exceptions=Exception
+overgeneral-exceptions=builtins.Exception

adafruit_midi/channel_pressure.py

@@ -28,6 +28,7 @@ class ChannelPressure(MIDIMessage):
     :param int pressure: The pressure, 0-127.
     """
 
+    _message_slots = ["pressure", "channel"]
     _STATUS = 0xD0
     _STATUSMASK = 0xF0
     LENGTH = 2

adafruit_midi/control_change.py

@@ -30,6 +30,7 @@ class ControlChange(MIDIMessage):
 
     """
 
+    _message_slots = ["control", "value", "channel"]
     _STATUS = 0xB0
     _STATUSMASK = 0xF0
     LENGTH = 3

adafruit_midi/midi_continue.py

@@ -25,6 +25,8 @@
 class Continue(MIDIMessage):
     """Continue MIDI message."""
 
+    _message_slots = []
+
     _STATUS = 0xFB
     _STATUSMASK = 0xFF
     LENGTH = 1

adafruit_midi/midi_message.py

@@ -312,6 +312,20 @@ def from_bytes(cls, msg_bytes: bytes) -> "MIDIMessage":
         representation of the MIDI message."""
         return cls()
 
+    def __str__(self):
+        """Print an instance"""
+        cls = self.__class__
+        if slots := getattr(cls, "_message_slots", None):
+            # pylint: disable=not-an-iterable
+            args = ", ".join(
+                f"{name}={repr(getattr(self, name, None))}" for name in slots
+            )
+        else:
+            args = "..."
+        return f"{self.__class__.__name__}({args})"
+
+    __repr__ = __str__
+
 
 # DO NOT try to register these messages
 class MIDIUnknownEvent(MIDIMessage):
@@ -323,6 +337,7 @@ class MIDIUnknownEvent(MIDIMessage):
     or because it is not imported.
     """
 
+    _message_slots = ["status"]
     LENGTH = -1
 
     def __init__(self, status: int):
@@ -343,6 +358,8 @@ class MIDIBadEvent(MIDIMessage):
 
     LENGTH = -1
 
+    _message_slots = ["msg_bytes", "exception"]
+
     def __init__(self, msg_bytes: bytearray, exception: Exception):
         self.data = bytes(msg_bytes)
         self.exception_text = repr(exception)

adafruit_midi/mtc_quarter_frame.py

@@ -41,6 +41,8 @@ class MtcQuarterFrame(MIDIMessage):
     :param value: The quarter frame value for the specified type.
     """
 
+    _message_slots = ["msgtype", "value"]
+
     _STATUS = 0xF1
     _STATUSMASK = 0xFF
     LENGTH = 2

adafruit_midi/note_off.py

@@ -31,6 +31,7 @@ class NoteOff(MIDIMessage):  # pylint: disable=duplicate-code
 
     """
 
+    _message_slots = ["note", "velocity", "channel"]
     _STATUS = 0x80
     _STATUSMASK = 0xF0
     LENGTH = 3

adafruit_midi/note_on.py

@@ -31,6 +31,8 @@ class NoteOn(MIDIMessage):
         to a Note Off, defaults to 127.
     """
 
+    _message_slots = ["note", "velocity", "channel"]
+
     _STATUS = 0x90
     _STATUSMASK = 0xF0
     LENGTH = 3

adafruit_midi/pitch_bend.py

@@ -29,6 +29,7 @@ class PitchBend(MIDIMessage):
         bend from 0 through 8192 (midpoint, no bend) to 16383.
     """
 
+    _message_slots = ["pitch_bend", "channel"]
     _STATUS = 0xE0
     _STATUSMASK = 0xF0
     LENGTH = 3