summaryrefslogtreecommitdiff
path: root/numpy/ma/testutils.py
diff options
context:
space:
mode:
authorJarrod Millman <millman@berkeley.edu>2008-08-08 04:33:45 +0000
committerJarrod Millman <millman@berkeley.edu>2008-08-08 04:33:45 +0000
commit70ed0f238156680efba9b4028810f3aed486357b (patch)
treee5e0f42e586156ed74128cff0fe84404398b918b /numpy/ma/testutils.py
parent0da812e06828be6749b1840b48c4f100dc3dfd68 (diff)
downloadnumpy-70ed0f238156680efba9b4028810f3aed486357b.tar.gz
ran reindent
Diffstat (limited to 'numpy/ma/testutils.py')
-rw-r--r--numpy/ma/testutils.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/ma/testutils.py b/numpy/ma/testutils.py
index 33030489c..8de590be5 100644
--- a/numpy/ma/testutils.py
+++ b/numpy/ma/testutils.py
@@ -147,9 +147,9 @@ def assert_almost_equal(actual, desired, decimal=7, err_msg='', verbose=True):
The test is equivalent to abs(desired-actual) < 0.5 * 10**(-decimal)
"""
if isinstance(actual, np.ndarray) or isinstance(desired, np.ndarray):
- return assert_array_almost_equal(actual, desired, decimal=decimal,
+ return assert_array_almost_equal(actual, desired, decimal=decimal,
err_msg=err_msg, verbose=verbose)
- msg = build_err_msg([actual, desired],
+ msg = build_err_msg([actual, desired],
err_msg=err_msg, verbose=verbose)
assert round(abs(desired - actual),decimal) == 0, msg
@@ -170,13 +170,13 @@ def assert_array_compare(comparison, x, y, err_msg='', verbose=True, header='',
y = masked_array(yf, copy=False, mask=m)
if ((x is masked) and not (y is masked)) or \
((y is masked) and not (x is masked)):
- msg = build_err_msg([x, y], err_msg=err_msg, verbose=verbose,
+ msg = build_err_msg([x, y], err_msg=err_msg, verbose=verbose,
header=header, names=('x', 'y'))
raise ValueError(msg)
# OK, now run the basic tests on filled versions
- return utils.assert_array_compare(comparison,
- x.filled(fill_value), y.filled(fill_value),
- err_msg=err_msg,
+ return utils.assert_array_compare(comparison,
+ x.filled(fill_value), y.filled(fill_value),
+ err_msg=err_msg,
verbose=verbose, header=header)