Cleaning up __all__ list and numpy namespace.

1 files changed, 12 insertions, 2 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