4 files changed, 16 insertions, 4 deletions
diff --git a/numpy/lib/__init__.py b/numpy/lib/__init__.py
index 13c5ec10b..34a39e63b 100644
--- a/numpy/lib/__init__.py
+++ b/numpy/lib/__init__.py
@@ -13,10 +13,20 @@ import scimath as math
 from polynomial import *
 from machar import *
 from getlimits import *
-import convertcode
+#import convertcode
 from utils import *
 
-__all__ = filter(lambda s:not s.startswith('_'),dir())
+__all__ = []
+__all__ += type_check.__all__
+__all__ += index_tricks.__all__
+__all__ += function_base.__all__
+__all__ += shape_base.__all__
+__all__ += twodim_base.__all__
+__all__ += ufunclike.__all__
+__all__ += polynomial.__all__
+__all__ += machar.__all__
+__all__ += getlimits.__all__
+__all__ += utils.__all__
 
 from numpy.testing import ScipyTest 
 test = ScipyTest().test
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index d0b3535d0..b3c94a264 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -1,7 +1,7 @@
 
-l__all__ = ['logspace', 'linspace',
+__all__ = ['logspace', 'linspace',
            'select', 'piecewise', 'trim_zeros',
-           'copy', 'iterable', 'base_repr', 'binary_repr', 
+           'copy', 'iterable', #'base_repr', 'binary_repr', 
            'diff', 'gradient', 'angle', 'unwrap', 'sort_complex', 'disp',
            'unique', 'extract', 'insert', 'nansum', 'nanmax', 'nanargmax',
            'nanargmin', 'nanmin', 'vectorize', 'asarray_chkfinite', 'average',
diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py
index 13d565b4c..315bb3533 100644
--- a/numpy/lib/tests/test_index_tricks.py
+++ b/numpy/lib/tests/test_index_tricks.py
@@ -2,6 +2,7 @@
 from numpy.testing import *
 set_package_path()
 import numpy.lib;reload(numpy.lib)
+from numpy import *
 from numpy.lib import *
 restore_path()
 
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 1ed309f7c..4213078c5 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -5,6 +5,7 @@
 from numpy.testing import *
 set_package_path()
 import numpy.lib;reload(numpy.lib)
+from numpy import *
 from numpy.lib import *
 restore_path()