Fix relative imports in the midi module

fretwork/midi/EventDispatcher.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from DataTypeConverters import readBew
-from DataTypeConverters import toBytes
-
-from constants import *
+from .DataTypeConverters import readBew
+from .DataTypeConverters import toBytes
+from .constants import *
 
 
 class EventDispatcher:

fretwork/midi/MidiFileParser.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# uhh I don't really like this, but there are so many constants to
-# import otherwise
-from constants import *
+from .EventDispatcher import EventDispatcher
+from .constants import *
 
-from EventDispatcher import EventDispatcher
 
 class MidiFileParser(object):
 

fretwork/midi/MidiInFile.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from RawInstreamFile import RawInstreamFile
-from MidiFileParser import MidiFileParser
+from .MidiFileParser import MidiFileParser
+from .RawInstreamFile import RawInstreamFile
 
 
 class MidiInFile(object):
@@ -38,14 +38,12 @@ def __init__(self, outStream, infile):
         self.raw_in = RawInstreamFile(infile)
         self.parser = MidiFileParser(self.raw_in, outStream)
 
-
     def read(self):
         "Start parsing the file"
         p = self.parser
         p.parseMThdChunk()
         p.parseMTrkChunks()
 
-
     def setData(self, data=''):
         "Sets the data from a plain string"
         self.raw_in.setData(data)

fretwork/midi/MidiInStream.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from MidiOutStream import MidiOutStream
+from .MidiOutStream import MidiOutStream
+
 
 class MidiInStream(object):
 

fretwork/midi/MidiOutFile.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from MidiOutStream import MidiOutStream
-from RawOutstreamFile import RawOutstreamFile
+from .DataTypeConverters import fromBytes
+from .DataTypeConverters import writeVar
+from .MidiOutStream import MidiOutStream
+from .RawOutstreamFile import RawOutstreamFile
+from .constants import *
 
-from constants import *
-from DataTypeConverters import fromBytes, writeVar
 
 class MidiOutFile(MidiOutStream):
 

fretwork/midi/MidiToText.py

@@ -1,7 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-from MidiOutStream import MidiOutStream
+from .MidiOutStream import MidiOutStream
+
+
 class MidiToText(MidiOutStream):
 
 

fretwork/midi/RawInstreamFile.py

@@ -3,9 +3,9 @@
 
 import os.path
 
-from DataTypeConverters import readBew as readBew_
-from DataTypeConverters import readVar
-from DataTypeConverters import varLen
+from .DataTypeConverters import readBew as readBew_
+from .DataTypeConverters import readVar
+from .DataTypeConverters import varLen
 
 
 class RawInstreamFile(object):

fretwork/midi/RawOutstreamFile.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-# standard library imports
 import sys
 from types import StringType
 from cStringIO import StringIO
 
-# custom import
-from DataTypeConverters import writeBew, writeVar
+from .DataTypeConverters import writeVar
+from .DataTypeConverters import writeBew
+
 
 class RawOutstreamFile(object):
 

fretwork/midi/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from MidiOutStream import MidiOutStream
-from MidiOutFile import MidiOutFile
-from MidiInStream import MidiInStream
-from MidiInFile import MidiInFile
-from MidiToText import MidiToText
+from .MidiInFile import MidiInFile
+from .MidiInStream import MidiInStream
+from .MidiOutFile import MidiOutFile
+from .MidiOutStream import MidiOutStream
+from .MidiToText import MidiToText
 
 __all__ = ['MidiOutStream',
            'MidiOutFile',