summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_recfunctions.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-07-04 22:47:52 -0600
committerCharles Harris <charlesr.harris@gmail.com>2015-07-04 23:51:48 -0600
commite79d6e306c675eee852a8ebaa26a137d4296841a (patch)
treea3985fe1efd680b46d30668c4418232c5dad0edc /numpy/lib/tests/test_recfunctions.py
parent9bc2d3214a454e5341b27bf4a22bc8a241b86a83 (diff)
downloadnumpy-e79d6e306c675eee852a8ebaa26a137d4296841a.tar.gz
BUG: Fix imports in test_io.py and test_recfunctions.py.
Those test functions were incorrectly importing test functions from numpy/ma/testutils that were actually not defined there, but rather in numpy/testing. That did not cause an error when testutils was '*' importing all the test functions, but it was deceptive as some of the functions might appear to support masked arrays when they do not.
Diffstat (limited to 'numpy/lib/tests/test_recfunctions.py')
-rw-r--r--numpy/lib/tests/test_recfunctions.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py
index 13e75cbd0..09cc29dc1 100644
--- a/numpy/lib/tests/test_recfunctions.py
+++ b/numpy/lib/tests/test_recfunctions.py
@@ -3,9 +3,8 @@ from __future__ import division, absolute_import, print_function
import numpy as np
import numpy.ma as ma
from numpy.ma.mrecords import MaskedRecords
-from numpy.ma.testutils import (
- run_module_suite, TestCase, assert_, assert_equal
- )
+from numpy.ma.testutils import assert_equal
+from numpy.testing import TestCase, run_module_suite, assert_
from numpy.lib.recfunctions import (
drop_fields, rename_fields, get_fieldstructure, recursive_fill_fields,
find_duplicates, merge_arrays, append_fields, stack_arrays, join_by