Merge maskedarray branch up to r4729.

1 files changed, 15 insertions, 10 deletions

diff --git a/numpy/__init__.py b/numpy/__init__.py
index b7ee2a417..8623735a7 100644
--- a/numpy/__init__.py
+++ b/numpy/__init__.py
@@ -1,4 +1,4 @@
-"""\
+"""
 NumPy
 ==========
 
@@ -7,25 +7,29 @@ the book "Guide to NumPy" at
 
   http://www.trelgol.com
 
-It is being distributed for a fee for only a few years to
+It is being distributed for a fee until Oct. 2010 to
 cover some of the costs of development.  After the restriction period
 it will also be freely available.
 
-Additional documentation is available in the docstrings and at
+Documentation is available in the docstrings and at
 
 http://www.scipy.org.
 """
 
+# We first need to detect if we're being called as part of the numpy setup
+# procedure itself in a reliable manner.
 try:
-    from numpy.__config__ import show as show_config
-except ImportError:
-    show_config = None
+    __NUMPY_SETUP__
+except NameError:
+    __NUMPY_SETUP__ = False
 
-if show_config is None:
+
+if __NUMPY_SETUP__:
     import sys as _sys
     print >> _sys.stderr, 'Running from numpy source directory.'
     del _sys
 else:
+    from numpy.__config__ import show as show_config
     from version import version as __version__
 
     from _import_tools import PackageLoader
@@ -34,6 +38,7 @@ else:
         loader = PackageLoader(infunc=True)
         return loader(*packages, **options)
 
+    pkgload.__doc__ = PackageLoader.__call__.__doc__
     import testing
     from testing import ScipyTest, NumpyTest
     import core
@@ -80,8 +85,8 @@ distutils --- Enhancements to distutils with support for
 
 Global symbols from subpackages
 -------------------------------
-core    --> *
-lib     --> *
+core    --> * (use numpy.* not numpy.core.*)
+lib     --> * (use numpy.* not numpy.lib.*)
 testing --> NumpyTest
 """
 
@@ -95,7 +100,7 @@ testing --> NumpyTest
 
     import add_newdocs
 
-    __all__.extend(['add_newdocs','test'])
+    __all__.extend(['add_newdocs'])
 
     if __doc__ is not None:
         __doc__ += """