diff options
| author | Pierre Glaser <pierreglaser@msn.com> | 2018-09-19 17:07:25 +0200 |
|---|---|---|
| committer | Pierre Glaser <pierreglaser@msn.com> | 2018-10-10 14:53:45 +0200 |
| commit | 7372f8dcc6af4446e502c0daec3199dace27e863 (patch) | |
| tree | cc9f39762defb52b875ca4e969cb9498a25aa4b4 /numpy/core/numeric.py | |
| parent | 86a7acc8582923604fac849bb19f0b08efc0a91a (diff) | |
| download | numpy-7372f8dcc6af4446e502c0daec3199dace27e863.tar.gz | |
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
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index fed3c0a9d..7c9e41299 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -40,7 +40,13 @@ ufunc = type(sin) newaxis = None if sys.version_info[0] >= 3: - import pickle + 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: |