diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2019-02-22 02:59:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 02:59:14 +0100 |
| commit | cb90765f5e0cd207f5d946fb4e4da763c29ec5d4 (patch) | |
| tree | 2cf18d5b551afd86970ff2d9c55675e071b7786d /numpy/core/numeric.py | |
| parent | 3898fe3fc26245e909c1d2d695b4455f07d4b06c (diff) | |
| parent | b6dc039961768bd5f3a3d7f57e8c396f8fa02815 (diff) | |
| download | numpy-cb90765f5e0cd207f5d946fb4e4da763c29ec5d4.tar.gz | |
Merge pull request #13008 from charris/move-pickle-import
MAINT: Move pickle import to numpy.compat
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index c06b0cf98..386049410 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -15,6 +15,7 @@ import numbers import contextlib import numpy as np +from numpy.compat import pickle, basestring from . import multiarray from .multiarray import ( _fastCopyAndTranspose as fastCopyAndTranspose, ALLOW_THREADS, @@ -44,17 +45,8 @@ ufunc = type(sin) newaxis = None if sys.version_info[0] >= 3: - if sys.version_info[1] in (6, 7): - try: - import pickle5 as pickle - except ImportError: - import pickle - else: - import pickle - basestring = str import builtins else: - import cPickle as pickle import __builtin__ as builtins |