Python 3 and jazz updates

mingus/containers/bar.py

@@ -49,12 +49,22 @@ def __init__(self, key="C", meter=(4, 4)):
         self.set_meter(meter)
         self.empty()
 
+    #Convenient Python operator overloading
+
+    def __iadd__(self, other):
+        self.temporal_notes.append(other)
+        return self
+
     def empty(self):
         """Empty the Bar, remove all the NoteContainers."""
+        self.temporal_notes = []
         self.bar = []
         self.current_beat = 0.0
         return self.bar
 
+    def set_chord_notes(self, chords):
+        self.chords = chords
+
     def set_meter(self, meter):
         """Set the meter of this bar.
 
@@ -77,6 +87,10 @@ def set_meter(self, meter):
                 "Expecting a tuple." % meter
             )
 
+    def extend(self, temporal_notes):
+        for note in temporal_notes:
+            self.temporal_notes.append(note)
+
     def place_notes(self, notes, duration):
         """Place the notes on the current_beat.
 

mingus/containers/note.py

@@ -51,6 +51,7 @@ def __init__(self, name="C", octave=4, dynamics=None):
         if dynamics is None:
             dynamics = {}
         if isinstance(name, six.string_types):
+
             self.set_note(name, octave, dynamics)
         elif hasattr(name, "name"):
             # Hardcopy Note object
@@ -66,6 +67,7 @@ def __init__(self, name="C", octave=4, dynamics=None):
                 "Don't know what to do with name object: " "'%s'" % name
             )
 
+
     def set_channel(self, channel):
         self.channel = channel
 
@@ -262,7 +264,7 @@ def from_shorthand(self, shorthand):
     def __int__(self):
         """Return the current octave multiplied by twelve and add
         notes.note_to_int to it.
-        
+
         This means a C-0 returns 0, C-1 returns 12, etc. This method allows
         you to use int() on Notes.
         """
@@ -272,7 +274,7 @@ def __int__(self):
                 res += 1
             elif n == "b":
                 res -= 1
-        return res
+        return int(res)
 
     def __lt__(self, other):
         """Enable the comparing operators on Notes (>, <, \ ==, !=, >= and <=).
@@ -293,6 +295,11 @@ def __eq__(self, other):
         """Compare Notes for equality by comparing their note values."""
         if other is None:
             return False
+
+        # added as was getting erros from play_Bar.set_key
+        if type(other) == str:
+            other = Note(other)
+
         return int(self) == int(other)
 
     def __ne__(self, other):
@@ -310,3 +317,4 @@ def __ge__(self, other):
     def __repr__(self):
         """Return a helpful representation for printing Note classes."""
         return "'%s-%d'" % (self.name, self.octave)
+

mingus/containers/note_container.py

@@ -23,7 +23,6 @@
 from mingus.containers.mt_exceptions import UnexpectedObjectError
 import six
 
-
 class NoteContainer(object):
 
     """A container for notes.

mingus/containers/suite.py

@@ -20,7 +20,6 @@
 
 from mingus.containers.mt_exceptions import UnexpectedObjectError
 
-
 class Suite(object):
 
     """A suite object.

mingus/containers/track.py

@@ -70,6 +70,7 @@ def add_notes(self, note, duration=None):
                     "Note '%s' is not in range of the instrument (%s)"
                     % (note, self.instrument)
                 )
+
         if duration == None:
             duration = 4