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/core/numeric.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/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: |