diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-09-16 07:13:02 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-09-16 07:13:02 +0000 |
| commit | a0a2b2bba65baaa1ab88fef3995911c14adaf2d4 (patch) | |
| tree | 1a7eafb8f59ca069dfcede261eab8df1c41a3462 /numpy/testing/utils.py | |
| parent | fe002b2916a5928463f7c46c5c4875114228bf7f (diff) | |
| download | numpy-a0a2b2bba65baaa1ab88fef3995911c14adaf2d4.tar.gz | |
Import issubdtype from numpy.core directly so that testing.utils does not depend on numpy.lib.
Diffstat (limited to 'numpy/testing/utils.py')
| -rw-r--r-- | numpy/testing/utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py index 96b2d462c..df4596670 100644 --- a/numpy/testing/utils.py +++ b/numpy/testing/utils.py @@ -702,11 +702,12 @@ def assert_array_almost_equal(x, y, decimal=6, err_msg='', verbose=True): y: array([ 1. , 2.33333, 5. ]) """ - from numpy.core import around, number, float_, any - from numpy.lib import issubdtype + from numpy.core import around, number, float_ + from numpy.core.numerictypes import issubdtype + from numpy.core.fromnumeric import any as npany def compare(x, y): try: - if any(gisinf(x)) or any( gisinf(y)): + if npany(gisinf(x)) or npany( gisinf(y)): xinfid = gisinf(x) yinfid = gisinf(y) if not xinfid == yinfid: |