Fixed lib

12 files changed, 28 insertions, 28 deletions

diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index b7c8c04be..694c727ed 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -12,12 +12,12 @@ l__all__ = ['logspace', 'linspace', 'round_',
 
 import types
 import math
-import numeric as _nx
-from numeric import ones, zeros, arange, concatenate, array, asarray, empty
-from numeric import ScalarType, dot, where, newaxis
-from umath import pi, multiply, add, arctan2, maximum, minimum, frompyfunc, \
+import numpy.core.numeric as _nx
+from numpy.core.numeric import ones, zeros, arange, concatenate, array, asarray, empty
+from numpy.core.numeric import ScalarType, dot, where, newaxis
+from numpy.core.umath import pi, multiply, add, arctan2, maximum, minimum, frompyfunc, \
      isnan, absolute, cos, less_equal, sqrt, sin, mod
-from oldnumeric import ravel, nonzero, choose, \
+from numpy.core.oldnumeric import ravel, nonzero, choose, \
      sometrue, alltrue, reshape, any, all, typecodes, ArrayType, squeeze,\
      sort
 from type_check import ScalarType, isscalar
diff --git a/numpy/lib/getlimits.py b/numpy/lib/getlimits.py
index 3220d0bab..825f286e8 100644
--- a/numpy/lib/getlimits.py
+++ b/numpy/lib/getlimits.py
@@ -4,8 +4,8 @@
 __all__ = ['finfo']
 
 from machar import MachAr
-import numeric
-from numeric import array
+import numpy.core.numeric
+from numpy.core.numeric import array
 
 def _frz(a):
     """fix rank-0 --> rank-1"""
diff --git a/numpy/lib/machar.py b/numpy/lib/machar.py
index e00d112ef..55659dbaa 100644
--- a/numpy/lib/machar.py
+++ b/numpy/lib/machar.py
@@ -7,8 +7,8 @@
 
 __all__ = ['MachAr']
 
-from numeric import array
-from oldnumeric import any
+from numpy.core.numeric import array
+from numpy.core.oldnumeric import any
 
 # Need to speed this up...especially for longfloat
 
diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py
index 9085c26be..f082cdc0d 100644
--- a/numpy/lib/mlab.py
+++ b/numpy/lib/mlab.py
@@ -1,13 +1,13 @@
 # This module is for compatibility only.  All functions are defined elsewhere.
 
-from numeric import *
+from numpy.core.numeric import *
 
 from twodim_base import eye, tri, diag, fliplr, flipud, rot90, tril, triu
-from oldnumeric import amax as max
-from oldnumeric import amin as min
+from numpy.core.oldnumeric import amax as max
+from numpy.core.oldnumeric import amin as min
 from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, blackman, \
      bartlett, hanning, hamming, sinc, angle
-from oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze
+from numpy.core.oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze
 from polynomial import roots
 
 from numpy.random import rand, randn
diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py
index 3cebba552..5bc65cafd 100644
--- a/numpy/lib/polynomial.py
+++ b/numpy/lib/polynomial.py
@@ -7,7 +7,7 @@ __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd',
            'polyfit']
 
 import re
-import numeric as NX
+import numpy.core.numeric as NX
 
 from type_check import isscalar
 from twodim_base import diag, vander
@@ -19,7 +19,7 @@ lstsq = None
 def get_linalg_funcs():
     "Look for linear algebra functions in numpy"
     global eigvals, lstsq
-    from numpy.corelinalg import eigvals, lstsq
+    from numpy.linalg import eigvals, lstsq
     return
 
 def _eigvals(arg):
@@ -288,7 +288,7 @@ def polymul(a1, a2):
 def deconvolve(signal, divisor):
     """Deconvolves divisor out of signal.  Requires numpy.signal library
     """
-    import numpy.signal
+    import scipy.signal
     num = atleast_1d(signal)
     den = atleast_1d(divisor)
     N = len(num)
diff --git a/numpy/lib/scimath.py b/numpy/lib/scimath.py
index 4202fa640..1e06946b6 100644
--- a/numpy/lib/scimath.py
+++ b/numpy/lib/scimath.py
@@ -6,8 +6,8 @@ whose output data-type is different than the input data-type in certain domains
 __all__ = ['sqrt', 'log', 'log2', 'logn','log10', 'power', 'arccos',
            'arcsin', 'arctanh']
 
-import numeric as nx
-from numeric import *
+import numpy.core.numeric as nx
+from numpy.core.numeric import *
 
 from type_check import isreal, asscalar
 
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index f4db3f59c..593b46a15 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -3,9 +3,9 @@ __all__ = ['atleast_1d','atleast_2d','atleast_3d','vstack','hstack',
            'vsplit','dsplit','apply_over_axes','expand_dims',
            'apply_along_axis']
 
-import numeric as _nx
-from numeric import *
-from oldnumeric import product
+import numpy.core.numeric as _nx
+from numpy.core.numeric import *
+from numpy.core.oldnumeric import product
 
 from type_check import isscalar
 
diff --git a/numpy/lib/test_shape_base.py b/numpy/lib/tests/test_shape_base.py
index 175bc8584..175bc8584 100644
--- a/numpy/lib/test_shape_base.py
+++ b/numpy/lib/tests/test_shape_base.py
diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py
index b21532ea6..49aa09757 100644
--- a/numpy/lib/twodim_base.py
+++ b/numpy/lib/twodim_base.py
@@ -5,7 +5,7 @@
 __all__ = ['diag','eye','fliplr','flipud','rot90','tri','triu','tril',
            'vander']
 
-from numeric import *
+from numpy.core.numeric import *
 import sys
 
 def fliplr(m):
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index 97b7e9832..214e3504a 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -6,11 +6,11 @@ __all__ = ['iscomplexobj','isrealobj','imag','iscomplex',
            'typename','asfarray','mintypecode','asscalar',
            'common_type']
 
-import numeric as _nx
-from numeric import ndarray, asarray, array, isinf, isnan, isfinite, signbit, \
+import numpy.core.numeric as _nx
+from numpy.core.numeric import ndarray, asarray, array, isinf, isnan, isfinite, signbit, \
      ufunc, ScalarType, obj2dtype
 from ufunclike import isneginf, isposinf
-import umath
+import numpy.core.umath as umath
 
 _typecodes_by_elsize = 'GDFgdfQqLlIiHhBb?'
 
diff --git a/numpy/lib/ufunclike.py b/numpy/lib/ufunclike.py
index 7e8d44c7d..ee5d918d6 100644
--- a/numpy/lib/ufunclike.py
+++ b/numpy/lib/ufunclike.py
@@ -4,8 +4,8 @@ storing results in an output array.
 """
 __all__ = ['fix', 'isneginf', 'isposinf', 'sign', 'log2']
 
-import numeric as nx
-from numeric import asarray, empty, empty_like, isinf, signbit, zeros
+import numpy.core.numeric as nx
+from numpy.core.numeric import asarray, empty, empty_like, isinf, signbit, zeros
 import umath
 
 def fix(x, y=None):
diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py
index be5a34295..88a22ab21 100644
--- a/numpy/lib/utils.py
+++ b/numpy/lib/utils.py
@@ -1,4 +1,4 @@
-from numerictypes import obj2dtype
+from numpy.core.numerictypes import obj2dtype
 
 __all__ = ['issubclass_', 'get_numpy_include', 'issubdtype']