diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-12-18 21:22:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 21:22:42 -0800 |
| commit | abb9bb52d9e09780a6519c42a2900f83a4bdc557 (patch) | |
| tree | f9a626c4eb7dd58b23dd454b03bd7cead8e54bbb /numpy/core/numeric.py | |
| parent | 34c9950ccdb8a2f64916903b09c2c39233be0adf (diff) | |
| parent | 0f13a2e7fa626dbde62bdda7a92fc0a6361981ba (diff) | |
| download | numpy-abb9bb52d9e09780a6519c42a2900f83a4bdc557.tar.gz | |
Merge branch 'master' into move_histogram
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index ac64b0537..431467a5a 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -42,7 +42,13 @@ else: import cPickle as pickle import __builtin__ as builtins -loads = pickle.loads + +def loads(*args, **kwargs): + # NumPy 1.15.0, 2017-12-10 + warnings.warn( + "np.core.numeric.loads is deprecated, use pickle.loads instead", + DeprecationWarning, stacklevel=2) + return pickle.loads(*args, **kwargs) __all__ = [ @@ -2134,6 +2140,10 @@ def load(file): load, save """ + # NumPy 1.15.0, 2017-12-10 + warnings.warn( + "np.core.numeric.load is deprecated, use pickle.load instead", + DeprecationWarning, stacklevel=2) if isinstance(file, type("")): file = open(file, "rb") return pickle.load(file) |