From 2d0b625d58a48525ded47c4d184ad3837e71c316 Mon Sep 17 00:00:00 2001
From: Travis Oliphant <oliphant@enthought.com>
Date: Mon, 19 Sep 2005 23:41:29 +0000
Subject: Fixing some array scalar inconsistencies.

---
 scipy/base/numeric.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'scipy/base/numeric.py')

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 *
-- 
cgit v1.2.1