Merge pull request #3 from bwhitman/master

Fixed for python 3

4 files changed, 15 insertions, 15 deletions

diff --git a/examples/pitchshift.py b/examples/pitchshift.py
index df27c7e..b7d74fd 100644
--- a/examples/pitchshift.py
+++ b/examples/pitchshift.py
@@ -8,7 +8,7 @@ usage = 'Usage: python {0} '.format(__file__) + \
     '<input wav file> <pitch shift amount> <output wav file>'
 
 if len(sys.argv) != 4:
-    print usage
+    print(usage)
     sys.exit(1)
 
 audio, sampling_rate = simpl.read_wav(sys.argv[1])
diff --git a/setup.py b/setup.py
index c44e0f9..2154d74 100644
--- a/setup.py
+++ b/setup.py
@@ -29,13 +29,13 @@ try:
     except AttributeError:
         numpy_include = numpy.get_numpy_include()
 except ImportError:
-    print 'Error: Numpy was not found.'
+    print('Error: Numpy was not found.')
     exit(1)
 
 macros = []
 link_args = []
 include_dirs = ['simpl', 'src/simpl', 'src/sms', 'src/sndobj',
-                'src/loris', 'src/mq', numpy_include, '/usr/local/include']
+                'src/loris', 'src/mq', numpy_include, '/usr/local/include', '.']
 libs = ['m', 'fftw3', 'gsl', 'gslcblas']
 compile_args = ['-DMERSENNE_TWISTER', '-DHAVE_FFTW3_H']
 sources = []
diff --git a/simpl/__init__.py b/simpl/__init__.py
index 932ed1d..9dd817e 100644
--- a/simpl/__init__.py
+++ b/simpl/__init__.py
@@ -1,12 +1,12 @@
 import numpy as np
-import base
-import peak_detection
-import partial_tracking
-import synthesis
-import residual
-import plot
-import audio
-import pybase
+import simpl.base
+import simpl.peak_detection
+import simpl.partial_tracking
+import simpl.synthesis
+import simpl.residual
+import simpl.plot
+import simpl.audio
+import simpl.pybase
 
 dtype = np.double
 Frame = base.Frame
@@ -36,7 +36,7 @@ SMSResidual = residual.SMSResidual
 plot_peaks = plot.plot_peaks
 plot_partials = plot.plot_partials
 
-import mq
+import simpl.mq
 MQPeakDetection = mq.MQPeakDetection
 MQPartialTracking = mq.MQPartialTracking
 MQSynthesis = mq.MQSynthesis
diff --git a/simpl/plot/__init__.py b/simpl/plot/__init__.py
index aa8bebf..75441c6 100644
--- a/simpl/plot/__init__.py
+++ b/simpl/plot/__init__.py
@@ -1,5 +1,5 @@
 import matplotlib.pyplot as plt
-import colours
+import simpl.plot.colours
 
 
 def plot_peaks(frames):
@@ -12,7 +12,7 @@ def plot_peaks(frames):
             max_amp = max(max_amp, max([p.amplitude for p in frame.peaks]))
 
     if not max_amp:
-        print "No peaks with an amplitude of > 0 to plot"
+        print("No peaks with an amplitude of > 0 to plot")
         return
 
     for frame_number, frame in enumerate(frames):
@@ -32,7 +32,7 @@ def plot_partials(frames, show_peaks=False):
             max_amp = max(max_amp, max([p.amplitude for p in frame.partials]))
 
     if not max_amp:
-        print "No partial peaks with an amplitude of > 0 to plot"
+        print("No partial peaks with an amplitude of > 0 to plot")
         return
 
     for n in range(len(frames) - 1):