Final commit before merge to trunk.

2 files changed, 1 insertions, 3 deletions

diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py
index 5bc65cafd..62d195c8a 100644
--- a/numpy/lib/polynomial.py
+++ b/numpy/lib/polynomial.py
@@ -9,7 +9,7 @@ __all__ = ['poly', 'roots', 'polyint', 'polyder', 'polyadd',
 import re
 import numpy.core.numeric as NX
 
-from type_check import isscalar
+from numpy.core import isscalar
 from twodim_base import diag, vander
 from shape_base import hstack, atleast_1d
 from function_base import trim_zeros, sort_complex
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 593b46a15..e35b30f6e 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -7,8 +7,6 @@ import numpy.core.numeric as _nx
 from numpy.core.numeric import *
 from numpy.core.oldnumeric import product
 
-from type_check import isscalar
-
 def apply_along_axis(func1d,axis,arr,*args):
     """ Execute func1d(arr[i],*args) where func1d takes 1-D arrays
         and arr is an N-d array.  i varies so as to apply the function