summaryrefslogtreecommitdiff
path: root/numpy/lib/format.py
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/lib/format.py
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/lib/format.py')
-rw-r--r--numpy/lib/format.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/format.py b/numpy/lib/format.py
index 10945e5e8..7648be615 100644
--- a/numpy/lib/format.py
+++ b/numpy/lib/format.py
@@ -162,9 +162,8 @@ import io
import warnings
from numpy.lib.utils import safe_eval
from numpy.compat import (
- asbytes, asstr, isfileobj, long, os_fspath
+ asbytes, asstr, isfileobj, long, os_fspath, pickle
)
-from numpy.core.numeric import pickle
MAGIC_PREFIX = b'\x93NUMPY'