diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-09-19 23:41:29 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-09-19 23:41:29 +0000 |
| commit | 2d0b625d58a48525ded47c4d184ad3837e71c316 (patch) | |
| tree | 6ee5981bd1723dfde53fbf92d7fba58e897188cb /scipy/base/numeric.py | |
| parent | dc87df7f9c06d35ab172d9961f7c81a0148a212d (diff) | |
| download | numpy-2d0b625d58a48525ded47c4d184ad3837e71c316.tar.gz | |
Fixing some array scalar inconsistencies.
Diffstat (limited to 'scipy/base/numeric.py')
| -rw-r--r-- | scipy/base/numeric.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scipy/base/numeric.py b/scipy/base/numeric.py index a559d2331..e128e1b6a 100644 --- a/scipy/base/numeric.py +++ b/scipy/base/numeric.py @@ -1,11 +1,10 @@ import sys import multiarray +import umath from umath import * from numerictypes import * -#import _numpy # for freeze dependency resolution (at least on Mac) - import types, math newaxis = None @@ -321,3 +320,7 @@ def getbufsize(size): # Set the UFUNC_ERRMASK_NAME to something seterr(where='builtin') setbufsize(UFUNC_BUFSIZE_DEFAULT,where='builtin') + +inf = PINF +nan = NAN +from oldnumeric import * |