fix: handle iter-/generators correctly in MidiOut.send_message (#186)

Signed-off-by: Christopher Arndt <[email protected]>

Author: SpotlightKid

Makefile

@@ -18,7 +18,7 @@ help:
 	@echo "release - package a release"
 	@echo "release_upload - package a release and upload it to PyPI"
 	@echo "requirements - generate 'requirement-dev.txt' from 'requirements-dev.in'"
-	@echo "test - run tests on every supported Python version with tox"
+	@echo "test - run tests with pytest"
 
 build: $(SOURCES)
 	if [[ -d "$(BUILDDIR)" ]]; then \

src/_rtmidi.pyx

@@ -1101,11 +1101,16 @@ cdef class MidiOut(MidiBase):
         if not message:
             raise ValueError("'message' must not be empty.")
 
-        if len(message) > 3 and message[0] != 0xF0:
-            raise ValueError("'message' longer than 3 bytes but does not "
-                             "start with 0xF0.")
+        try:
+            msg_v.reserve(len(message))
+        except TypeError:
+            pass
 
         for c in message:
             msg_v.push_back(c)
 
+        if msg_v.size() > 3 and msg_v.at(0) != 0xF0:
+            raise ValueError("'message' longer than 3 bytes but does not "
+                             "start with 0xF0.")
+
         self.thisptr.sendMessage(&msg_v)

tests/test_rtmidi.py

@@ -12,6 +12,7 @@
 class BaseTests:
     NOTE_ON = [0x90, 48, 100]
     NOTE_OFF = [0x80, 48, 16]
+    SYSEX_IDENTITY_REQUEST = [0xF0, 0x7E, 0x7F, 6, 1, 0xF7]
     IN_CLIENT_NAME = "RtMidiTestCase In"
     OUT_CLIENT_NAME = "RtMidiTestCase Out"
     IN_PORT_NAME = 'testin'
@@ -67,10 +68,32 @@ def test_send_and_get_message(self):
         self.midi_out.send_message(self.NOTE_ON)
         self.midi_out.send_message(self.NOTE_OFF)
         time.sleep(self.DELAY)
-        message_1, _ = self.midi_in.get_message()
-        message_2, _ = self.midi_in.get_message()
-        self.assertEqual(message_1, self.NOTE_ON)
-        self.assertEqual(message_2, self.NOTE_OFF)
+        event_1 = self.midi_in.get_message()
+        event_2 = self.midi_in.get_message()
+        self.assertTrue(isinstance(event_1, tuple))
+        self.assertTrue(isinstance(event_2, tuple))
+        self.assertEqual(event_1[0], self.NOTE_ON)
+        self.assertEqual(event_2[0], self.NOTE_OFF)
+
+    def test_send_supports_iterator(self):
+        self.set_up_loopback()
+        self.midi_out.send_message(iter(self.NOTE_ON))
+        time.sleep(self.DELAY)
+        event = self.midi_in.get_message()
+        self.assertTrue(isinstance(event, tuple))
+        self.assertEqual(event[0], self.NOTE_ON)
+
+    def test_send_raises_if_message_too_long(self):
+        self.assertRaises(ValueError, self.midi_out.send_message, [1, 2, 3, 4])
+
+    def test_send_accepts_sysex(self):
+        self.set_up_loopback()
+        self.midi_in.ignore_types(sysex=False)
+        self.midi_out.send_message(self.SYSEX_IDENTITY_REQUEST)
+        time.sleep(self.DELAY)
+        event = self.midi_in.get_message()
+        self.assertTrue(isinstance(event, tuple))
+        self.assertEqual(event[0], self.SYSEX_IDENTITY_REQUEST)
 
     def test_callback(self):
         messages = []