summaryrefslogtreecommitdiff
path: root/numpy/testing/utils.py
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-09-21 10:28:14 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-09-21 10:28:14 +0000
commitc6bd244a25f37d6ff95860a883e564db8a497b51 (patch)
treec8782285e8c9bd31993a52abf2b137336db36813 /numpy/testing/utils.py
parentd16426e1542b105344468353caed7448177a0e02 (diff)
downloadnumpy-c6bd244a25f37d6ff95860a883e564db8a497b51.tar.gz
BUG: fix list/tuple handling in test_almost_equal.
We now forward tuple/list instances to test_array_almost_equal.
Diffstat (limited to 'numpy/testing/utils.py')
-rw-r--r--numpy/testing/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py
index f08796dc2..23b8de1f7 100644
--- a/numpy/testing/utils.py
+++ b/numpy/testing/utils.py
@@ -399,7 +399,8 @@ def assert_almost_equal(actual,desired,decimal=7,err_msg='',verbose=True):
"ACTUAL: %s\n" \
"DESIRED: %s\n" % (str(actual), str(desired)))
- if isinstance(actual, ndarray) or isinstance(desired, ndarray):
+ if isinstance(actual, (ndarray, tuple, list)) \
+ or isinstance(desired, (ndarray, tuple, list)):
return assert_array_almost_equal(actual, desired, decimal, err_msg)
msg = build_err_msg([actual, desired], err_msg, verbose=verbose,
header='Arrays are not almost equal')