From 7372f8dcc6af4446e502c0daec3199dace27e863 Mon Sep 17 00:00:00 2001 From: Pierre Glaser Date: Wed, 19 Sep 2018 17:07:25 +0200 Subject: 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 --- numpy/matrixlib/tests/test_masked_matrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/matrixlib/tests') 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,): -- cgit v1.2.1