diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2018-10-10 12:35:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 12:35:28 -0500 |
| commit | 9942b71a6782a850cf59462a3a9ceec39e741880 (patch) | |
| tree | 4a325f53c371eed147ce361a8f2ab7c8171e57cb /numpy/lib/format.py | |
| parent | 3626bf49a8520f521332f79ea89d330f8a464edf (diff) | |
| parent | 7372f8dcc6af4446e502c0daec3199dace27e863 (diff) | |
| download | numpy-9942b71a6782a850cf59462a3a9ceec39e741880.tar.gz | |
Merge pull request #12133 from pierreglaser/centralize-pickle-import
MAINT, TST refactor pickle imports and tests
Diffstat (limited to 'numpy/lib/format.py')
| -rw-r--r-- | numpy/lib/format.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/lib/format.py b/numpy/lib/format.py index ef5ec57e3..e25868236 100644 --- a/numpy/lib/format.py +++ b/numpy/lib/format.py @@ -162,11 +162,8 @@ import io import warnings from numpy.lib.utils import safe_eval from numpy.compat import asbytes, asstr, isfileobj, long, basestring +from numpy.core.numeric import pickle -if sys.version_info[0] >= 3: - import pickle -else: - import cPickle as pickle MAGIC_PREFIX = b'\x93NUMPY' MAGIC_LEN = len(MAGIC_PREFIX) + 2 |