Merge pull request #171 from exowanderer/master

upgraded to python3

Author: vishnubob

examples/example_1.py

@@ -15,6 +15,6 @@
 eot = midi.EndOfTrackEvent(tick=1)
 track.append(eot)
 # Print out the pattern
-print pattern
+print(pattern)
 # Save the pattern to disk
 midi.write_midifile("example.mid", pattern)

examples/example_2.py

@@ -1,3 +1,3 @@
 import midi
 pattern = midi.read_midifile("example.mid")
-print pattern
+print(pattern)

scripts/mididump.py

@@ -6,9 +6,9 @@
 import sys
 
 if len(sys.argv) != 2:
-    print "Usage: {0} <midifile>".format(sys.argv[0])
+    print("Usage: {0} <midifile>".format(sys.argv[0]))
     sys.exit(2)
 
 midifile = sys.argv[1]
 pattern = midi.read_midifile(midifile)
-print repr(pattern)
+print(repr(pattern))

scripts/mididumphw.py

@@ -6,4 +6,4 @@
 
 s = sequencer.SequencerHardware()
 
-print s
+print(s)

scripts/midilisten.py

@@ -8,7 +8,7 @@
 import midi.sequencer as sequencer
 
 if len(sys.argv) != 3:
-    print "Usage: {0} <client> <port>".format(sys.argv[0])
+    print("Usage: {0} <client> <port>".format(sys.argv[0]))
     exit(2)
 
 client = sys.argv[1]
@@ -21,4 +21,4 @@
 while True:
   event = seq.event_read()
   if event is not None:
-      print event
+      print(event)

scripts/midiplay.py

@@ -8,7 +8,7 @@
 import midi.sequencer as sequencer
 
 if len(sys.argv) != 4:
-    print "Usage: {0} <client> <port> <file>".format(sys.argv[0])
+    print("Usage: {0} <client> <port> <file>".format(sys.argv[0]))
     exit(2)
 
 client   = sys.argv[1]
@@ -45,4 +45,4 @@
     seq.drain()
     time.sleep(.5)
 
-print 'The end?'
+print('The end?')

setup.py

@@ -62,7 +62,7 @@ def configure_platform():
         setup_alsa(ns)
         pass
     else:
-        print "No sequencer available for '%s' platform." % platform
+        print("No sequencer available for '%s' platform." % platform)
     return ns
 
 if __name__ == "__main__":

src/__init__.py

@@ -1,5 +1,6 @@
-from containers import *
-from events import *
+from .containers import *
+from .events import *
+from .util import *
+from .fileio import *
+
 from struct import unpack, pack
-from util import *
-from fileio import *

src/events.py

@@ -6,21 +6,21 @@ class EventRegistry(object):
 
     def register_event(cls, event, bases):
         if (Event in bases) or (NoteEvent in bases):
-            assert event.statusmsg not in cls.Events, \
+            assert(event.statusmsg not in cls.Events), \
                             "Event %s already registered" % event.name
             cls.Events[event.statusmsg] = event
         elif (MetaEvent in bases) or (MetaEventWithText in bases):
             if event.metacommand is not None:
-                assert event.metacommand not in cls.MetaEvents, \
+                assert(event.metacommand not in cls.MetaEvents), \
                                 "Event %s already registered" % event.name
                 cls.MetaEvents[event.metacommand] = event
         else:
-            raise ValueError, "Unknown bases class in event type: "+event.name
+            raise ValueError("Unknown bases class in event type: "+event.name)
     register_event = classmethod(register_event)
 
 
 class AbstractEvent(object):
-    __slots__ = ['tick', 'data']
+    # __slots__ = ['tick', 'data']
     name = "Generic MIDI Event"
     length = 0
     statusmsg = 0x0
@@ -61,7 +61,7 @@ def __repr__(self):
 
 
 class Event(AbstractEvent):
-    __slots__ = ['channel']
+    # __slots__ = ['channel']
     name = 'Event'
 
     def __init__(self, **kw):
@@ -111,7 +111,7 @@ def is_event(cls, statusmsg):
 """
 
 class NoteEvent(Event):
-    __slots__ = ['pitch', 'velocity']
+    # __slots__ = ['pitch', 'velocity']
     length = 2
 
     def get_pitch(self):
@@ -152,7 +152,7 @@ def set_value(self, val):
     value = property(get_value, set_value)
 
 class ControlChangeEvent(Event):
-    __slots__ = ['control', 'value']
+    # __slots__ = ['control', 'value']
     statusmsg = 0xB0
     length = 2
     name = 'Control Change'
@@ -170,7 +170,7 @@ def get_value(self):
     value = property(get_value, set_value)
 
 class ProgramChangeEvent(Event):
-    __slots__ = ['value']
+    # __slots__ = ['value']
     statusmsg = 0xC0
     length = 1
     name = 'Program Change'
@@ -182,7 +182,7 @@ def get_value(self):
     value = property(get_value, set_value)
 
 class ChannelAfterTouchEvent(Event):
-    __slots__ = ['value']
+    # __slots__ = ['value']
     statusmsg = 0xD0
     length = 1
     name = 'Channel After Touch'
@@ -194,7 +194,7 @@ def get_value(self):
     value = property(get_value, set_value)
 
 class PitchWheelEvent(Event):
-    __slots__ = ['pitch']
+    # __slots__ = ['pitch']
     statusmsg = 0xE0
     length = 2
     name = 'Pitch Wheel'
@@ -302,7 +302,7 @@ class EndOfTrackEvent(MetaEvent):
     metacommand = 0x2F
 
 class SetTempoEvent(MetaEvent):
-    __slots__ = ['bpm', 'mpqn']
+    # __slots__ = ['bpm', 'mpqn']
     name = 'Set Tempo'
     metacommand = 0x51
     length = 3
@@ -326,7 +326,7 @@ class SmpteOffsetEvent(MetaEvent):
     metacommand = 0x54
 
 class TimeSignatureEvent(MetaEvent):
-    __slots__ = ['numerator', 'denominator', 'metronome', 'thirtyseconds']
+    # __slots__ = ['numerator', 'denominator', 'metronome', 'thirtyseconds']
     name = 'Time Signature'
     metacommand = 0x58
     length = 4
@@ -356,7 +356,7 @@ def set_thirtyseconds(self, val):
     thirtyseconds = property(get_thirtyseconds, set_thirtyseconds)
 
 class KeySignatureEvent(MetaEvent):
-    __slots__ = ['alternatives', 'minor']
+    # __slots__ = ['alternatives', 'minor']
     name = 'Key Signature'
     metacommand = 0x59
     length = 2

src/fileio.py

@@ -1,10 +1,10 @@
+from struct import unpack, pack
 from warnings import *
 
-from containers import *
-from events import *
-from struct import unpack, pack
-from constants import *
-from util import *
+from .containers import *
+from .events import *
+from .constants import *
+from .util import *
 
 class FileReader(object):
     def read(self, midifile):
@@ -17,7 +17,7 @@ def parse_file_header(self, midifile):
         # First four bytes are MIDI header
         magic = midifile.read(4)
         if magic != 'MThd':
-            raise TypeError, "Bad header in MIDI file."
+            raise TypeError("Bad header in MIDI file.")
         # next four bytes are header size
         # next two bytes specify the format version
         # next two bytes specify the number of tracks
@@ -38,7 +38,7 @@ def parse_track_header(self, midifile):
         # First four bytes are Track header
         magic = midifile.read(4)
         if magic != 'MTrk':
-            raise TypeError, "Bad track header in MIDI file: " + magic
+            raise TypeError("Bad track header in MIDI file: " + magic)
         # next four bytes are track size
         trksz = unpack(">L", midifile.read(4))[0]
         return trksz
@@ -63,7 +63,7 @@ def parse_midi_event(self, trackdata):
         if MetaEvent.is_event(stsmsg):
             cmd = ord(trackdata.next())
             if cmd not in EventRegistry.MetaEvents:
-                warn("Unknown Meta MIDI Event: " + `cmd`, Warning)
+                warn("Unknown Meta MIDI Event: " + cmd, Warning)
                 cls = UnknownMetaEvent
             else:
                 cls = EventRegistry.MetaEvents[cmd]
@@ -83,7 +83,7 @@ def parse_midi_event(self, trackdata):
         else:
             key = stsmsg & 0xF0
             if key not in EventRegistry.Events:
-                assert self.RunningStatus, "Bad byte value"
+                assert(self.RunningStatus), "Bad byte value"
                 data = []
                 key = self.RunningStatus & 0xF0
                 cls = EventRegistry.Events[key]
@@ -97,7 +97,7 @@ def parse_midi_event(self, trackdata):
                 channel = self.RunningStatus & 0x0F
                 data = [ord(trackdata.next()) for x in range(cls.length)]
                 return cls(tick=tick, channel=channel, data=data)
-        raise Warning, "Unknown MIDI Event: " + `stsmsg`
+        raise Warning("Unknown MIDI Event: " + stsmsg)
 
 class FileWriter(object):
     def write(self, midifile, pattern):
@@ -146,17 +146,17 @@ def encode_midi_event(self, event):
                     ret += chr(event.statusmsg | event.channel)
             ret += str.join('', map(chr, event.data))
         else:
-            raise ValueError, "Unknown MIDI Event: " + str(event)
+            raise ValueError("Unknown MIDI Event: " + str(event))
         return ret
 
 def write_midifile(midifile, pattern):
-    if type(midifile) in (str, unicode):
-        midifile = open(midifile, 'wb')
+    if isinstance(midifile, str):
+        midifile = open(midifile, 'w')
     writer = FileWriter()
     return writer.write(midifile, pattern)
 
 def read_midifile(midifile):
-    if type(midifile) in (str, unicode):
-        midifile = open(midifile, 'rb')
+    if isinstance(midifile, str):
+        midifile = open(midifile, 'r')
     reader = FileReader()
     return reader.read(midifile)

src/sequencer.py

@@ -60,7 +60,7 @@ def __iter__(self):
 
     def __next_edge(self):
         if self.endoftrack:
-            raise StopIteration
+            raise StopIteration("")
         lastedge = self.window_edge
         self.window_edge += int(self.window_length / self.tempo.mpt)
         if self.window_edge > self.ttp:

src/sequencer_alsa/__init__.py

@@ -1,4 +1,4 @@
 try:
-    from sequencer import *
+    from .sequencer import *
 except ImportError:
     pass

src/sequencer_alsa/sequencer.py

@@ -72,7 +72,7 @@ def get_nonblock(self):
     def _error(self, errcode):
         strerr = S.snd_strerror(errcode)
         msg = "ALSAError[%d]: %s" % (errcode, strerr)
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
 
     def _init_handle(self):
         ret = S.open_client(self.alsa_sequencer_name,
@@ -204,7 +204,7 @@ def output_pending(self):
     ## EVENT HANDLERS
     ##
     def event_write(self, event, direct=False, relative=False, tick=False):
-        #print event.__class__, event
+        #print(event.__class__, event)
         ## Event Filter
         if isinstance(event, midi.EndOfTrackEvent):
             return
@@ -269,7 +269,7 @@ def event_write(self, event, direct=False, relative=False, tick=False):
             seqev.data.control.value = event.pitch
         ## Unknown
         else:
-            print "Warning :: Unknown event type: %s" % event
+            print("Warning :: Unknown event type: %s" % event)
             return None
 
         err = S.snd_seq_event_output(self.client, seqev)

src/sequencer_osx/sequencer_osx.py

@@ -31,7 +31,7 @@ def _swig_getattr(self,class_type,name):
     if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
-    raise AttributeError,name
+    raise AttributeError(name)
 
 def _swig_repr(self):
     try: strthis = "proxy of " + self.this.__repr__()

src/sequencer_osx/test.py

@@ -1,9 +1,9 @@
 import sequencer_osx
-print "MIDIGetNumberOfDevices:", sequencer_osx._MIDIGetNumberOfDevices()
+print("MIDIGetNumberOfDevices:", sequencer_osx._MIDIGetNumberOfDevices())
 client = sequencer_osx._MIDIClientCreate("python")
 endpoint = sequencer_osx._MIDISourceCreate(client, "python-source")
 port = sequencer_osx._MIDIOutputPortCreate(client, "python-port")
 sequencer_osx._MIDIPortConnectSource(port, endpoint)
-print client, endpoint, endpoint
+print(client, endpoint, endpoint)
 raw_input()
 #sequencer_osx._MIDIClientDispose(handle)

tests/tests.py

@@ -44,7 +44,7 @@ def get_loop_client_port(self):
         hw = sequencer.SequencerHardware()
         ports = {port.name: port for port in hw}
         loop = ports.get("Midi Through", None)
-        assert loop != None, "Could not find Midi Through port!"
+        assert(loop != None), "Could not find Midi Through port!"
         loop_port = loop.get_port("Midi Through Port-0")
         return (loop.client, loop_port.port)