Compatible with wxPython 4

Compatible with wxPython 4
Fixed Python 3 issues

Author: jwdj

abc2xml.py

@@ -53,9 +53,9 @@ def setNibbles(hiNibble, loNibble):
 def readBew(value):
     """
     Reads string as big endian word, (asserts len(value) in [1,2,4])
-    >>> readBew('aáâã')
+    >>> readBew('a���')
     1642193635L
-    >>> readBew('aá')
+    >>> readBew('a�')
     25057
     """
     return unpack('>%s' % {1:'B', 2:'H', 4:'L'}[len(value)], value)[0]
@@ -88,9 +88,9 @@ def readVar(value):
     might be a varlen and it will only use the relevant chars.
     use varLen(readVar(value)) to see how many bytes the integer value takes.
     asserts len(value) >= 0
-    >>> readVar('€@')
+    >>> readVar('�@')
     64
-    >>> readVar('áâãa')
+    >>> readVar('���a')
     205042145
     """
     sum = 0
@@ -142,68 +142,6 @@ def fromBytes(value):
         return ''
     return pack('%sB' % len(value), *value)
 
-
-
-if __name__ == '__main__':
-
-#    print to7bits(0, 3)
-#    print to7bits(127, 3)
-#    print to7bits(255, 3)
-#    print to7bits(65536, 3)
-
-    # simple test cases
-    
-#    print 'getHiLoHex', getNibbles(16)
-#    print 'setHiLoHex', setNibbles(1,0)
-#    
-#    print 'readBew', readBew('aáâã')
-#    print 'writeBew', writeBew(1642193635, 4)
-#
-#    print 'varLen', varLen(1)
-#
-    print 'readVar', readVar('€@')
-    print 'writeVar', writeVar(8192)
-    
-    print 'readVar', readVar('áâãa')
-    print 'writeVar', writeVar(205058401)
-#    
-#    vartest = '\x82\xF7\x80\x00'
-#    print 'toBytes', toBytes(vartest)
-#    print 'fromBytes', fromBytes([48, 49, 50,])
-    
-    
-#    instr = '\xFF\xFF\xFF\x00'
-#    print 'readVar', readVar(instr)
-#    inst2 = 268435455
-#    print inst2
-#    print writeVar(inst2)
-#    print writeVar(readVar(instr))
-
-    s1 = 0x00000000
-    print '%08X -' % s1, '00',  writeVar(s1)
-    s2 = 0x00000040
-    print '%08X -' % s2, '40',  writeVar(s2)
-    s3 = 0x0000007F
-    print '%08X -' % s3, '7F',  writeVar(s3)
-    s4 = 0x00000080
-    print '%08X -' % s4, '81 00',  writeVar(s4)
-    s5 = 0x00002000
-    print '%08X -' % s5, 'C0 00',  writeVar(s5)
-    s6 = 0x00003FFF
-    print '%08X -' % s6, 'FF 7F',  writeVar(s6)
-    s7 = 0x00004000
-    print '%08X -' % s7, '81 80 00',  writeVar(s7)
-    s8 = 0x00100000
-    print '%08X -' % s8, 'C0 80 00',  writeVar(s8)
-    s9 = 0x001FFFFF
-    print '%08X -' % s9, 'FF FF 7F',  writeVar(s9)
-    s10 = 0x00200000
-    print '%08X -' % s10, '81 80 80 00', writeVar(s10)
-    s11 = 0x08000000
-    print '%08X -' % s11, 'C0 80 80 00', writeVar(s11)
-    s12 = 0x0FFFFFFF
-    print '%08X -' % s12, 'FF FF FF 7F', writeVar(s12)
-              
 
 
 

easy_abc.py

@@ -4,11 +4,11 @@
 from struct import unpack
 
 # custom
-from DataTypeConverters import readBew, readVar, varLen, toBytes
+from .DataTypeConverters import readBew, readVar, varLen, toBytes
 
 # uhh I don't really like this, but there are so many constants to 
 # import otherwise
-from constants import *
+from .constants import *
 
 
 class EventDispatcher:
@@ -132,7 +132,7 @@ def channel_messages(self, hi_nible, channel, data):
 
         else:
 
-            raise ValueError, 'Illegal channel message!'
+            raise ValueError('Illegal channel message!')
 
 
 

midi/DataTypeConverters.py

@@ -5,9 +5,9 @@
 
 # uhh I don't really like this, but there are so many constants to 
 # import otherwise
-from constants import *
+from .constants import *
 
-from EventDispatcher import EventDispatcher
+from .EventDispatcher import EventDispatcher
 
 class MidiFileParser:
 
@@ -45,7 +45,7 @@ def parseMThdChunk(self):
 
         # check if it is a proper midi file
         if header_chunk_type != 'MThd':
-            raise TypeError, "It is not a valid midi file!"
+            raise TypeError("It is not a valid midi file!")
 
         # Header values are at fixed locations, so no reason to be clever
         self.format = raw_in.readBew(2)

midi/EventDispatcher.py

@@ -1,7 +1,7 @@
 # -*- coding: ISO-8859-1 -*-
 
-from RawInstreamFile import RawInstreamFile
-from MidiFileParser import MidiFileParser
+from .RawInstreamFile import RawInstreamFile
+from .MidiFileParser import MidiFileParser
 
 
 class MidiInFile:

midi/MidiFileParser.py

@@ -1,11 +1,21 @@
 # -*- coding: ISO-8859-1 -*-
 
+import sys
+PY3 = sys.version_info.major > 2
+
+if PY3:
+    unichr = chr
+    xrange = range
+    def unicode(s):
+        return s
+    max_int = sys.maxsize
+    basestring = str
+
 # standard library imports
-from types import StringTypes
 from struct import unpack
 
 # custom import
-from DataTypeConverters import readBew, readVar, varLen
+from .DataTypeConverters import readBew, readVar, varLen
 
 
 class RawInstreamFile:
@@ -28,7 +38,7 @@ def __init__(self, infile=''):
         copy them into memory.
         """
         if infile:
-            if isinstance(infile, StringTypes):
+            if isinstance(infile, basestring):
                 infile = open(infile, 'rb')
                 self.data = infile.read()
                 infile.close()
@@ -99,10 +109,10 @@ def readVarLen(self):
 
     test_file = 'test/midifiles/minimal.mid'
     fis = RawInstreamFile(test_file)
-    print fis.nextSlice(len(fis.data))
+    print(fis.nextSlice(len(fis.data)))
 
     test_file = 'test/midifiles/cubase-minimal.mid'
     cubase_minimal = open(test_file, 'rb')
     fis2 = RawInstreamFile(cubase_minimal)
-    print fis2.nextSlice(len(fis2.data))
+    print(fis2.nextSlice(len(fis2.data)))
     cubase_minimal.close()