From 32dce64c0b17688c92ac34acfa9ff21424865842 Mon Sep 17 00:00:00 2001 From: ocefpaf Date: Thu, 12 Feb 2015 21:41:40 -0300 Subject: [PATCH] Code base works with py3 and py27. --- utide/__init__.py | 6 ++++-- utide/comparison.py | 7 +++++-- utide/master.py | 6 ++++-- utide/masterRec.py | 5 ++++- utide/robustfit.py | 3 ++- utide/simple_utide_test.py | 9 +++++---- utide/ut_E.py | 5 ++++- utide/ut_FUV.py | 7 +++++-- utide/ut_astron.py | 2 ++ utide/ut_cnstitsel.py | 7 +++++-- utide/ut_confidence.py | 10 ++++++---- utide/ut_cs2cep.py | 2 ++ utide/ut_diagn.py | 3 ++- utide/ut_fbndavg.py | 2 ++ utide/ut_linci.py | 2 ++ utide/ut_lmbscga.py | 2 ++ utide/ut_pdgm.py | 7 +++++-- utide/ut_rcninit.py | 2 ++ utide/ut_reconstr.py | 4 +++- utide/ut_reconstr1.py | 6 ++++-- utide/ut_slvinit.py | 2 ++ utide/ut_solv.py | 4 +++- utide/ut_solv1.py | 17 ++++++++++------- 23 files changed, 85 insertions(+), 35 deletions(-) diff --git a/utide/__init__.py b/utide/__init__.py index 0ea283f..eaf277c 100644 --- a/utide/__init__.py +++ b/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' diff --git a/utide/comparison.py b/utide/comparison.py index 105478e..1a62330 100644 --- a/utide/comparison.py +++ b/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. diff --git a/utide/master.py b/utide/master.py index 40aab8b..a770d9b 100644 --- a/utide/master.py +++ b/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): diff --git a/utide/masterRec.py b/utide/masterRec.py index 6293c17..43206cb 100644 --- a/utide/masterRec.py +++ b/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): diff --git a/utide/robustfit.py b/utide/robustfit.py index ef34679..3f08e4f 100644 --- a/utide/robustfit.py +++ b/utide/robustfit.py @@ -1,4 +1,5 @@ -from __future__ import division +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/simple_utide_test.py b/utide/simple_utide_test.py index f38ce5e..519722b 100644 --- a/utide/simple_utide_test.py +++ b/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): diff --git a/utide/ut_E.py b/utide/ut_E.py index 1167c6f..4916067 100644 --- a/utide/ut_E.py +++ b/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): diff --git a/utide/ut_FUV.py b/utide/ut_FUV.py index dbacbec..c0b758d 100644 --- a/utide/ut_FUV.py +++ b/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): diff --git a/utide/ut_astron.py b/utide/ut_astron.py index 9c5567c..c222dec 100644 --- a/utide/ut_astron.py +++ b/utide/ut_astron.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_cnstitsel.py b/utide/ut_cnstitsel.py index ed50c7d..3a8559b 100644 --- a/utide/ut_cnstitsel.py +++ b/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): diff --git a/utide/ut_confidence.py b/utide/ut_confidence.py index 0a154ec..be5ff9c 100644 --- a/utide/ut_confidence.py +++ b/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)) diff --git a/utide/ut_cs2cep.py b/utide/ut_cs2cep.py index 5b0487e..8f962f8 100644 --- a/utide/ut_cs2cep.py +++ b/utide/ut_cs2cep.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_diagn.py b/utide/ut_diagn.py index 07488e6..4b1d3bc 100644 --- a/utide/ut_diagn.py +++ b/utide/ut_diagn.py @@ -1,4 +1,5 @@ -from __future__ import division +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_fbndavg.py b/utide/ut_fbndavg.py index 55d2fb3..2ccedc8 100644 --- a/utide/ut_fbndavg.py +++ b/utide/ut_fbndavg.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_linci.py b/utide/ut_linci.py index 09c9c56..b6a0541 100644 --- a/utide/ut_linci.py +++ b/utide/ut_linci.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_lmbscga.py b/utide/ut_lmbscga.py index 4c7dcce..ce8021c 100644 --- a/utide/ut_lmbscga.py +++ b/utide/ut_lmbscga.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + # FIXME: Incomplete. import numpy as np diff --git a/utide/ut_pdgm.py b/utide/ut_pdgm.py index 7cf8e6a..59b6375 100644 --- a/utide/ut_pdgm.py +++ b/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): diff --git a/utide/ut_rcninit.py b/utide/ut_rcninit.py index cebc08b..e4efccc 100644 --- a/utide/ut_rcninit.py +++ b/utide/ut_rcninit.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_reconstr.py b/utide/ut_reconstr.py index 9a02a63..b43f20f 100644 --- a/utide/ut_reconstr.py +++ b/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): diff --git a/utide/ut_reconstr1.py b/utide/ut_reconstr1.py index 6fb954b..77e0448 100644 --- a/utide/ut_reconstr1.py +++ b/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): diff --git a/utide/ut_slvinit.py b/utide/ut_slvinit.py index 176562b..8093513 100644 --- a/utide/ut_slvinit.py +++ b/utide/ut_slvinit.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division + import numpy as np diff --git a/utide/ut_solv.py b/utide/ut_solv.py index 9505808..8a1d3dd 100644 --- a/utide/ut_solv.py +++ b/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): # diff --git a/utide/ut_solv1.py b/utide/ut_solv1.py index 48220b7..6b04664 100644 --- a/utide/ut_solv1.py +++ b/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):