Removed pkgload from numpy - all imports can be done explicitly.

1 files changed, 11 insertions, 33 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index 77ab8a7da..466461dbc 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -20,48 +20,26 @@ import os, sys
 NUMPY_IMPORT_VERBOSE = int(os.environ.get('NUMPY_IMPORT_VERBOSE','0'))
 
 try:
-    from __core_config__ import show as show_core_config
+    from __config__ import show as show_config
 except ImportError:
-    show_core_config = None
+    show_config = None
 
 try:
     import pkg_resources # activate namespace packages (manipulates __path__)
 except ImportError:
     pass
 
-import _import_tools
-pkgload = _import_tools.PackageLoader()
-
-if show_core_config is None:
-    print >> sys.stderr, 'Running from numpy core source directory.'
+if show_config is None:
+    print >> sys.stderr, 'Running from numpy source directory.'
 else:
     from version import version as __version__
-
-    pkgload('testing','core','lib','dft','linalg','random',
-            verbose=NUMPY_IMPORT_VERBOSE)
+    from testing import ScipyTest
+    from core import *
+    from lib import *
+    from dft import fft, ifft
+    from random import rand, randn
+    __all__ = filter(lambda s:not s.startswith('_'),dir())
 
     test = ScipyTest('numpy').test
-    __all__.append('test')
-
-__numpy_doc__ = """
-
-NumPy: A scientific computing package for Python
-================================================
-
-Available subpackages
----------------------
-"""
-
-if show_core_config is None:
-    show_numpy_config = None
-else:
-    try:
-        from __numpy_config__ import show as show_numpy_config
-    except ImportError:
-        show_numpy_config = None
-
 
-if show_numpy_config is not None:
-    from numpy_version import numpy_version as __numpy_version__
-    __doc__ += __numpy_doc__
-    pkgload(verbose=NUMPY_IMPORT_VERBOSE,postpone=True)
+    # TODO: Fix __doc__