[Scipy-svn] r5206 - trunk/scipy

scipy-svn@scip... scipy-svn@scip...
Sat Nov 29 07:42:58 CST 2008


Author: stefan
Date: 2008-11-29 07:42:49 -0600 (Sat, 29 Nov 2008)
New Revision: 5206

Modified:
   trunk/scipy/__init__.py
Log:
Clean up __init__.

Modified: trunk/scipy/__init__.py
===================================================================
--- trunk/scipy/__init__.py	2008-11-29 12:41:23 UTC (rev 5205)
+++ trunk/scipy/__init__.py	2008-11-29 13:42:49 UTC (rev 5206)
@@ -37,9 +37,9 @@
     __doc__ += """
 Contents
 --------
+SciPy imports all the functions from the NumPy namespace, and in
+addition provides:"""
 
-  numpy name space
-"""
 del _num
 # Remove the linalg imported from numpy so that the scipy.linalg package can be
 # imported.
@@ -63,19 +63,6 @@
 pkgload = PackageLoader()
 pkgload(verbose=SCIPY_IMPORT_VERBOSE,postpone=True)
 
-# Remove subpackage names from __all__ such that they are not imported via
-# "from scipy import *". This works around a numpy bug present in < 1.2.
-subpackages = """cluster constants fftpack integrate interpolate io lib linalg
-linsolve maxentropy misc ndimage odr optimize signal sparse special
-splinalg stats stsci weave""".split()
-for name in subpackages:
-    try:
-        __all__.remove(name)
-    except ValueError:
-        pass
-
-del name, subpackages
-
 if __doc__:
     __doc__ += """
 



More information about the Scipy-svn mailing list