summaryrefslogtreecommitdiff
path: root/numpy/ma/tests
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2019-02-21 12:49:33 -0700
committerCharles Harris <charlesr.harris@gmail.com>2019-02-21 12:49:33 -0700
commitb6dc039961768bd5f3a3d7f57e8c396f8fa02815 (patch)
tree2cf18d5b551afd86970ff2d9c55675e071b7786d /numpy/ma/tests
parent3898fe3fc26245e909c1d2d695b4455f07d4b06c (diff)
downloadnumpy-b6dc039961768bd5f3a3d7f57e8c396f8fa02815.tar.gz
MAINT: Move pickle import to numpy.compat
The pickle module was being imported from numpy.core.numeric. It was defined there in order to use pickle5 when available in Python3 and cpickle in Python2. The numpy.compat module seems a better place for that.
Diffstat (limited to 'numpy/ma/tests')
-rw-r--r--numpy/ma/tests/test_core.py2
-rw-r--r--numpy/ma/tests/test_mrecords.py2
-rw-r--r--numpy/ma/tests/test_old_ma.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
index e0dbf1b1a..1f80ba26d 100644
--- a/numpy/ma/tests/test_core.py
+++ b/numpy/ma/tests/test_core.py
@@ -49,7 +49,7 @@ from numpy.ma.core import (
ravel, repeat, reshape, resize, shape, sin, sinh, sometrue, sort, sqrt,
subtract, sum, take, tan, tanh, transpose, where, zeros,
)
-from numpy.core.numeric import pickle
+from numpy.compat import pickle
pi = np.pi
diff --git a/numpy/ma/tests/test_mrecords.py b/numpy/ma/tests/test_mrecords.py
index dbbf1c8a1..94e772d55 100644
--- a/numpy/ma/tests/test_mrecords.py
+++ b/numpy/ma/tests/test_mrecords.py
@@ -23,7 +23,7 @@ from numpy.ma.testutils import (
assert_, assert_equal,
assert_equal_records,
)
-from numpy.core.numeric import pickle
+from numpy.compat import pickle
class TestMRecords(object):
diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py
index 2978be22c..07bfb613f 100644
--- a/numpy/ma/tests/test_old_ma.py
+++ b/numpy/ma/tests/test_old_ma.py
@@ -21,7 +21,7 @@ from numpy.ma import (
repeat, resize, shape, sin, sinh, sometrue, sort, sqrt, subtract, sum,
take, tan, tanh, transpose, where, zeros,
)
-from numpy.core.numeric import pickle
+from numpy.compat import pickle
pi = np.pi