Merge pull request #10 from ocefpaf/scipy

Scipy

pywafo/src/wafo/MSO.py

@@ -1,4 +1,4 @@
-# -*- coding: mbcs -*-
+# -*- coding: utf-8 -*-
 # Created by makepy.py version 0.5.00
 # By python version 2.6.2 (r262:71605, Apr 14 2009, 22:40:02) [MSC v.1500 32 bit (Intel)]
 # From type library 'MSO.DLL'

pywafo/src/wafo/MSPPT.py

@@ -1,4 +1,4 @@
-# -*- coding: mbcs -*-
+# -*- coding: utf-8 -*-
 # Created by makepy.py version 0.5.00
 # By python version 2.6.2 (r262:71605, Apr 14 2009, 22:40:02) [MSC v.1500 32 bit (Intel)]
 # From type library 'msppt.olb'

pywafo/src/wafo/stats/_binned_statistic.py

@@ -3,7 +3,7 @@ from __future__ import division, print_function, absolute_import
 import warnings
 
 import numpy as np
-from scipy.lib.six import callable
+from scipy._lib.six import callable
 
 
 def binned_statistic(x, values, statistic='mean',

pywafo/src/wafo/stats/_distn_infrastructure.py

@@ -4,7 +4,7 @@
 #
 from __future__ import division, print_function, absolute_import
 
-from scipy.lib.six import string_types, exec_
+from scipy._lib.six import string_types, exec_
 
 import sys
 import keyword

pywafo/src/wafo/stats/_numpy_compat.py

@@ -7,7 +7,7 @@ import warnings
 
 import numpy as np
 
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 
 if NumpyVersion(np.__version__) > '1.7.0.dev':
     _assert_warns = np.testing.assert_warns

pywafo/src/wafo/stats/kde.py

@@ -23,7 +23,7 @@ from __future__ import division, print_function, absolute_import
 import warnings
 
 # Scipy imports.
-from scipy.lib.six import callable, string_types
+from scipy._lib.six import callable, string_types
 from scipy import linalg, special
 
 from numpy import atleast_2d, reshape, zeros, newaxis, dot, exp, pi, sqrt, \

pywafo/src/wafo/stats/morestats.py

@@ -13,7 +13,7 @@ from numpy import (isscalar, r_, log, sum, around, unique, asarray,
      floor, array, poly1d, compress, not_equal, pi, exp, ravel, angle)
 from numpy.testing.decorators import setastest
 
-from scipy.lib.six import string_types
+from scipy._lib.six import string_types
 from ._numpy_compat import count_nonzero
 from scipy import optimize
 from scipy import special

pywafo/src/wafo/stats/mstats_basic.py

@@ -40,7 +40,7 @@ from numpy import ndarray
 import numpy.ma as ma
 from numpy.ma import masked, nomask
 
-from scipy.lib.six import iteritems
+from scipy._lib.six import iteritems
 
 import itertools
 import warnings

pywafo/src/wafo/stats/stats.py

@@ -171,13 +171,13 @@ from __future__ import division, print_function, absolute_import
 import warnings
 import math
 
-from scipy.lib.six import xrange
+from scipy._lib.six import xrange
 
 # friedmanchisquare patch uses python sum
 pysum = sum  # save it before it gets overwritten
 
 # Scipy imports.
-from scipy.lib.six import callable, string_types
+from scipy._lib.six import callable, string_types
 from numpy import array, asarray, ma, zeros, sum
 import scipy.special as special
 import scipy.linalg as linalg

pywafo/src/wafo/stats/tests/common_tests.py

@@ -6,7 +6,7 @@ import warnings
 import numpy as np
 import numpy.testing as npt
 
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 from wafo import stats
 
 

pywafo/src/wafo/stats/tests/test_discrete_basic.py

@@ -2,7 +2,7 @@ from __future__ import division, print_function, absolute_import
 
 import numpy.testing as npt
 import numpy as np
-from scipy.lib.six import xrange
+from scipy._lib.six import xrange
 
 from wafo import stats
 from wafo.stats.tests.common_tests import (check_normalization, check_moment,

pywafo/src/wafo/stats/tests/test_distributions.py

@@ -15,7 +15,7 @@ from nose import SkipTest
 import numpy
 import numpy as np
 from numpy import typecodes, array
-from scipy.lib._version import NumpyVersion
+from scipy._lib._version import NumpyVersion
 from scipy import special
 import wafo.stats as stats
 from wafo.stats._distn_infrastructure import argsreduce