summaryrefslogtreecommitdiff
path: root/scipy/base/numeric.py
diff options
context:
space:
mode:
Diffstat (limited to 'scipy/base/numeric.py')
-rw-r--r--scipy/base/numeric.py7
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 *