diff options
author | Pierre Glaser <pierreglaser@msn.com> | 2018-09-19 17:07:25 +0200 |
---|---|---|
committer | Pierre Glaser <pierreglaser@msn.com> | 2018-10-10 14:53:45 +0200 |
commit | 7372f8dcc6af4446e502c0daec3199dace27e863 (patch) | |
tree | cc9f39762defb52b875ca4e969cb9498a25aa4b4 /numpy/matrixlib/tests/test_masked_matrix.py | |
parent | 86a7acc8582923604fac849bb19f0b08efc0a91a (diff) | |
download | numpy-7372f8dcc6af4446e502c0daec3199dace27e863.tar.gz |
MAINT, TST import pickle from numpy.core.numeric
All imports of pickle from numpy modules are now done this way:
>>> from numpy.core.numeric import pickle
Also, some loops on protocol numbers are added over pickle tests that
were not caught from #12090
Diffstat (limited to 'numpy/matrixlib/tests/test_masked_matrix.py')
-rw-r--r-- | numpy/matrixlib/tests/test_masked_matrix.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/matrixlib/tests/test_masked_matrix.py b/numpy/matrixlib/tests/test_masked_matrix.py index 7f84bb2c9..1751020db 100644 --- a/numpy/matrixlib/tests/test_masked_matrix.py +++ b/numpy/matrixlib/tests/test_masked_matrix.py @@ -1,6 +1,5 @@ from __future__ import division, absolute_import, print_function -import pickle import pytest import numpy as np @@ -10,6 +9,7 @@ from numpy.ma.core import (masked_array, masked_values, masked, allequal, MaskType, getmask, MaskedArray, nomask, log, add, hypot, divide) from numpy.ma.extras import mr_ +from numpy.core.numeric import pickle class MMatrix(MaskedArray, np.matrix,): |