diff --git a/adafruit_midi/channel_pressure.py b/adafruit_midi/channel_pressure.py index c3df6be..06f9730 100644 --- a/adafruit_midi/channel_pressure.py +++ b/adafruit_midi/channel_pressure.py @@ -36,7 +36,7 @@ def __init__(self, pressure, *, channel=None): self.pressure = pressure super().__init__(channel=channel) if not 0 <= self.pressure <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes([self._STATUS | (self.channel & self.CHANNELMASK), self.pressure]) diff --git a/adafruit_midi/control_change.py b/adafruit_midi/control_change.py index 6a10e2c..115ab95 100644 --- a/adafruit_midi/control_change.py +++ b/adafruit_midi/control_change.py @@ -39,7 +39,7 @@ def __init__(self, control, value, *, channel=None): self.value = value super().__init__(channel=channel) if not 0 <= self.control <= 127 or not 0 <= self.value <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes( diff --git a/adafruit_midi/midi_message.py b/adafruit_midi/midi_message.py index 5e2ffb3..ca0c651 100755 --- a/adafruit_midi/midi_message.py +++ b/adafruit_midi/midi_message.py @@ -89,7 +89,9 @@ class MIDIMessage: ENDSTATUS = None # Commonly used exceptions to save memory - _EX_VALUEERROR_OOR = ValueError("Out of range") + @staticmethod + def _raise_valueerror_oor(): + raise ValueError("Out of range") # Each element is ((status, mask), class) # order is more specific masks first diff --git a/adafruit_midi/note_off.py b/adafruit_midi/note_off.py index 2cbbb5a..83c34f0 100644 --- a/adafruit_midi/note_off.py +++ b/adafruit_midi/note_off.py @@ -40,7 +40,7 @@ def __init__(self, note, velocity=0, *, channel=None): self._velocity = velocity super().__init__(channel=channel) if not 0 <= self._note <= 127 or not 0 <= self._velocity <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes( diff --git a/adafruit_midi/note_on.py b/adafruit_midi/note_on.py index 8ca3a52..09c319a 100644 --- a/adafruit_midi/note_on.py +++ b/adafruit_midi/note_on.py @@ -40,7 +40,7 @@ def __init__(self, note, velocity=127, *, channel=None): self.velocity = velocity super().__init__(channel=channel) if not 0 <= self.note <= 127 or not 0 <= self.velocity <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes( diff --git a/adafruit_midi/pitch_bend.py b/adafruit_midi/pitch_bend.py index 63201a1..4cc9ac1 100644 --- a/adafruit_midi/pitch_bend.py +++ b/adafruit_midi/pitch_bend.py @@ -37,7 +37,7 @@ def __init__(self, pitch_bend, *, channel=None): self.pitch_bend = pitch_bend super().__init__(channel=channel) if not 0 <= self.pitch_bend <= 16383: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes( diff --git a/adafruit_midi/polyphonic_key_pressure.py b/adafruit_midi/polyphonic_key_pressure.py index 04abf1d..41eb0ba 100644 --- a/adafruit_midi/polyphonic_key_pressure.py +++ b/adafruit_midi/polyphonic_key_pressure.py @@ -39,7 +39,7 @@ def __init__(self, note, pressure, *, channel=None): self.pressure = pressure super().__init__(channel=channel) if not 0 <= self.note <= 127 or not 0 <= self.pressure <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes( diff --git a/adafruit_midi/program_change.py b/adafruit_midi/program_change.py index 3038d36..88c6925 100644 --- a/adafruit_midi/program_change.py +++ b/adafruit_midi/program_change.py @@ -36,7 +36,7 @@ def __init__(self, patch, *, channel=None): self.patch = patch super().__init__(channel=channel) if not 0 <= self.patch <= 127: - raise self._EX_VALUEERROR_OOR + self._raise_valueerror_oor() def __bytes__(self): return bytes([self._STATUS | (self.channel & self.CHANNELMASK), self.patch])