From 7372f8dcc6af4446e502c0daec3199dace27e863 Mon Sep 17 00:00:00 2001
From: Pierre Glaser <pierreglaser@msn.com>
Date: Wed, 19 Sep 2018 17:07:25 +0200
Subject: 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
---
 numpy/core/numeric.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'numpy/core/numeric.py')

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:
-- 
cgit v1.2.1