summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py10
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