Merge pull request #40 from jepler/no-reuse-exception

Don't reuse exception objects

Author: tannewt

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])

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(

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

adafruit_midi/mtc_quarter_frame.py

@@ -48,22 +48,19 @@ def __init__(self, msgtype, value):
         self.value = value
         super().__init__()
         if not 0 <= self.type <= 7 or not 0 <= self.value <= 0x0F:
-            raise self._EX_VALUEERROR_OOR
+            self._raise_valueerror_oor()
 
     def __bytes__(self):
         return bytes(
             [
                 self._STATUS,
-                (self.type << 4) + self.value  # Assemble low and high nibbles
+                (self.type << 4) + self.value,  # Assemble low and high nibbles
             ]
         )
 
     @classmethod
     def from_bytes(cls, msg_bytes):
-        return cls(
-            msg_bytes[1] >> 4,  # High nibble
-            msg_bytes[1] & 15  # Low nibble
-        )
+        return cls(msg_bytes[1] >> 4, msg_bytes[1] & 15)  # High nibble  # Low nibble
 
 
 MtcQuarterFrame.register_message_type()

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(

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(

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(

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(

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])