[Scipy-svn] r6932 - trunk/scipy/special

scipy-svn@scip... scipy-svn@scip...
Sat Nov 20 10:49:57 CST 2010


Author: warren.weckesser
Date: 2010-11-20 10:49:57 -0600 (Sat, 20 Nov 2010)
New Revision: 6932

Modified:
   trunk/scipy/special/__init__.py
   trunk/scipy/special/basic.py
Log:
special: Don't use 'import *' in basic.py.  The 'import *' from _cephes and numpy were moved up to __init__.py to maintain the same namespace in scipy.special.

Modified: trunk/scipy/special/__init__.py
===================================================================
--- trunk/scipy/special/__init__.py	2010-11-20 16:29:24 UTC (rev 6931)
+++ trunk/scipy/special/__init__.py	2010-11-20 16:49:57 UTC (rev 6932)
@@ -5,6 +5,8 @@
 from info import __doc__, __docformat__
 #from special_version import special_version as __version__
 
+from _cephes import *
+from numpy import *
 from basic import *
 import specfun
 import orthogonal

Modified: trunk/scipy/special/basic.py
===================================================================
--- trunk/scipy/special/basic.py	2010-11-20 16:29:24 UTC (rev 6931)
+++ trunk/scipy/special/basic.py	2010-11-20 16:49:57 UTC (rev 6932)
@@ -2,8 +2,11 @@
 # Author:  Travis Oliphant, 2002
 #
 
-from numpy import *
-from _cephes import *
+from numpy import pi, asarray, floor, isscalar, iscomplex, real, imag, sqrt, \
+        where, mgrid, cos, sin, exp, place, seterr, issubdtype, extract, \
+        complexfloating, less, vectorize, inexact, nan, zeros, sometrue
+from _cephes import ellipk, mathieu_a, mathieu_b, iv, jv, gamma, psi, zeta, \
+        hankel1, hankel2, yv, kv, gammaln, errprint, ndtri
 import types
 import specfun
 import orthogonal



More information about the Scipy-svn mailing list