summaryrefslogtreecommitdiff
path: root/scipy/test/testing.py
diff options
context:
space:
mode:
Diffstat (limited to 'scipy/test/testing.py')
-rw-r--r--scipy/test/testing.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scipy/test/testing.py b/scipy/test/testing.py
index 48752e5b5..01f2246ed 100644
--- a/scipy/test/testing.py
+++ b/scipy/test/testing.py
@@ -791,11 +791,11 @@ def output_exception():
finally:
type = value = tb = None # clean up
-from scipy_base.numerix import alltrue, equal, shape, ravel, around, zeros,\
+from scipy.base import alltrue, equal, shape, ravel, around, zeros,\
Float64, asarray, less_equal, array2string, less, ArrayType
try:
- from scipy_base.numerix import fastumath as math
+ import scipy.base.umath as math
except ImportError,msg:
print msg
import math