Merge pull request #12 from ocefpaf/py27_and_py3

Code base works with py3 and py27.

utide/__init__.py

@@ -1,11 +1,13 @@
+from __future__ import absolute_import
+
 import os
 
 base_dir = os.path.join(os.path.dirname(__file__), 'data')
 ut_constants = os.path.join(base_dir, 'ut_constants.mat')
 
 
-from ut_solv import ut_solv
-from ut_reconstr import ut_reconstr
+from .ut_solv import ut_solv
+from .ut_reconstr import ut_reconstr
 
 
 __version__ = '0.1b0.dev0'

utide/comparison.py

@@ -1,6 +1,9 @@
-import cPickle as pickle
-import scipy.io as sio
+from __future__ import absolute_import, division
+
+import pickle
+
 import numpy as np
+import scipy.io as sio
 
 
 # FIXME: coef.mat does not exist.

utide/master.py

@@ -1,8 +1,10 @@
+from __future__ import absolute_import, division
+
 import numpy as np
-import scipy.io as sio
 import scipy.sparse
+import scipy.io as sio
 
-from utide import ut_constants
+from . import ut_constants
 
 
 def ut_solv(tin, uin, vin, lat, cnstit, Rayleigh, *varargin):

utide/masterRec.py

@@ -1,6 +1,9 @@
-from ut_solv import ut_E
+from __future__ import absolute_import, division
+
 import numpy as np
 
+from .ut_solv import ut_E
+
 
 def ut_reconstr(tin, coef, varargin):
 

utide/robustfit.py

@@ -1,4 +1,5 @@
-from __future__ import division
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/simple_utide_test.py

@@ -1,11 +1,12 @@
-from __future__ import division
+from __future__ import absolute_import, division
+
 import numpy as np
 import scipy.io as sio
 import matplotlib.pyplot as plt
 
-from utide import ut_constants
-from ut_solv import ut_solv
-from ut_reconstr import ut_reconstr
+from . import ut_constants
+from .ut_solv import ut_solv
+from .ut_reconstr import ut_reconstr
 
 
 def simple_utide_test(debug=True):

utide/ut_E.py

@@ -1,5 +1,8 @@
+from __future__ import absolute_import, division
+
 import numpy as np
-from ut_FUV import ut_FUV
+
+from .ut_FUV import ut_FUV
 
 
 def ut_E(t, tref, frq, lind, lat, ngflgs, prefilt):

utide/ut_FUV.py

@@ -1,7 +1,10 @@
+from __future__ import absolute_import, division
+
 import scipy.io as sio
 import numpy as np
-from ut_astron import ut_astron
-from utide import ut_constants
+
+from .ut_astron import ut_astron
+from . import ut_constants
 
 
 def ut_FUV(t, tref, lind, lat, ngflgs):

utide/ut_astron.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_cnstitsel.py

@@ -1,7 +1,10 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 import scipy.io as sio
-from ut_astron import ut_astron
-from utide import ut_constants
+
+from .ut_astron import ut_astron
+from . import ut_constants
 
 
 def ut_cnstitsel(tref, minres, incnstit, infer):

utide/ut_confidence.py

@@ -1,8 +1,10 @@
-from __future__ import division
+from __future__ import absolute_import, division
+
 import numpy as np
 import scipy.interpolate as sip
-from ut_pdgm import ut_pdgm
-from ut_linci import ut_linci
+
+from .ut_pdgm import ut_pdgm
+from .ut_linci import ut_linci
 
 
 def ut_confidence(coef, opt, t, e, tin, tgd, uvgd, elor, xraw, xmod, W, m, B,
@@ -12,7 +14,7 @@ def ut_confidence(coef, opt, t, e, tin, tgd, uvgd, elor, xraw, xmod, W, m, B,
     print('conf. int vls... ')
 
     if not opt['white']:
-        # band-averaged (ba) spectral densities
+        # Band-averaged (ba) spectral densities.
         if opt['equi']:
             if np.sum(tgd) > np.sum(uvgd):
                 # efill = np.interp1(t, e, tin(tgd))

utide/ut_cs2cep.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_diagn.py

@@ -1,4 +1,5 @@
-from __future__ import division
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_fbndavg.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_linci.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_lmbscga.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 # FIXME: Incomplete.
 import numpy as np
 

utide/ut_pdgm.py

@@ -1,8 +1,11 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 import scipy.signal
 import matplotlib.mlab as mlab
-from ut_fbndavg import ut_fbndavg
-from ut_lmbscga import ut_lmbscga
+
+from .ut_fbndavg import ut_fbndavg
+from .ut_lmbscga import ut_lmbscga
 
 
 def ut_pdgm(t, e, cfrq, equi, frqosmp):

utide/ut_rcninit.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_reconstr.py

@@ -1,4 +1,6 @@
-from ut_reconstr1 import ut_reconstr1
+from __future__ import absolute_import, division
+
+from .ut_reconstr1 import ut_reconstr1
 
 
 def ut_reconstr(tin, coef, **opts):

utide/ut_reconstr1.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import, division
+
 import numpy as np
-from ut_rcninit import ut_rcninit
-from ut_E import ut_E
+from .ut_E import ut_E
+from .ut_rcninit import ut_rcninit
 
 
 def ut_reconstr1(tin, coef, **opts):

utide/ut_slvinit.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import, division
+
 import numpy as np
 
 

utide/ut_solv.py

@@ -1,4 +1,6 @@
-from ut_solv1 import ut_solv1
+from __future__ import absolute_import, division
+
+from .ut_solv1 import ut_solv1
 
 # def ut_solv(tin, uin, vin, lat, cnstit, Rayleigh, *varargin):
 #

utide/ut_solv1.py

@@ -1,11 +1,14 @@
-import numpy as np
+from __future__ import absolute_import, division
+
 import scipy
-from ut_slvinit import ut_slvinit
-from ut_E import ut_E
-from ut_cnstitsel import ut_cnstitsel
-from ut_cs2cep import ut_cs2cep
-from ut_confidence import ut_confidence
-from ut_diagn import ut_diagn
+import numpy as np
+
+from .ut_E import ut_E
+from .ut_diagn import ut_diagn
+from .ut_cs2cep import ut_cs2cep
+from .ut_slvinit import ut_slvinit
+from .ut_cnstitsel import ut_cnstitsel
+from .ut_confidence import ut_confidence
 
 
 def ut_solv1(tin, uin, vin, lat, **opts):