Allow velocity and channel directly as kwargs in Note constructor

Author: edudobay

mingus/containers/note.py

@@ -51,9 +51,15 @@ class Note(object):
     channel = _DEFAULT_CHANNEL
     velocity = _DEFAULT_VELOCITY
 
-    def __init__(self, name="C", octave=4, dynamics=None):
+    def __init__(self, name="C", octave=4, dynamics=None, velocity=None, channel=None):
         if dynamics is None:
             dynamics = {}
+
+        if velocity is not None:
+            dynamics["velocity"] = velocity
+        if channel is not None:
+            dynamics["channel"] = channel
+
         if isinstance(name, six.string_types):
             self.set_note(name, octave, dynamics)
         elif hasattr(name, "name"):
@@ -83,18 +89,24 @@ def set_velocity(self, velocity):
             raise ValueError("MIDI velocity must be 0-127")
         self.velocity = velocity
 
-    def set_note(self, name="C", octave=4, dynamics=None):
+    def set_note(self, name="C", octave=4, dynamics=None, velocity=None, channel=None):
         """Set the note to name in octave with dynamics.
 
         Return the objects if it succeeded, raise an NoteFormatError
         otherwise.
         """
         if dynamics is None:
             dynamics = {}
+
+        if velocity is not None:
+            self.set_velocity(velocity)
+        elif "velocity" in dynamics:
+            self.set_velocity(dynamics["velocity"])
+
+        if channel is not None:
+            self.set_channel(channel)
         if "channel" in dynamics:
             self.set_channel(dynamics["channel"])
-        if "velocity" in dynamics:
-            self.set_velocity(dynamics["velocity"])
 
         dash_index = name.split("-")
         if len(dash_index) == 1:

tests/unit/containers/test_note.py

@@ -117,11 +117,13 @@ def test_velocity(self):
         self.assertEqual(42, Note("A", 4, {"velocity": 42}).velocity)
         self.assertEqual(64, Note("A", 4, {"channel": 2}).velocity)  # default velocity
         self.assertEqual(42, Note(Note("A", 4, {"velocity": 42})).velocity)
+        self.assertEqual(42, Note("A", 4, velocity=42).velocity)
 
     def test_channel(self):
         self.assertEqual(1, Note("A", 4, {"velocity": 100}).channel)  # default channel
         self.assertEqual(4, Note("A", 4, {"channel": 4}).channel)
         self.assertEqual(4, Note(Note("A", 4, {"channel": 4})).channel)
+        self.assertEqual(8, Note("A", 4, channel=8).channel)
 
     def test_invalid_channel(self):
         with self.assertRaises(ValueError):