summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkritisingh1 <kritisingh1.ks@gmail.com>2019-07-17 15:02:01 +0530
committerkritisingh1 <kritisingh1.ks@gmail.com>2019-07-21 11:33:48 +0530
commitf08de36dffc42606a129ca30de495943b78a2156 (patch)
tree8c19703c7cc3946d0b4056107e8980ad336bf317
parente55bcb2f2c40852be7d9f0e6e262c332dd2b277d (diff)
downloadnumpy-f08de36dffc42606a129ca30de495943b78a2156.tar.gz
DEP: Raise warnings for deprecated C functions - PyArray_As1D, PyArray_As2D
-rw-r--r--numpy/core/src/multiarray/multiarraymodule.c33
1 files changed, 6 insertions, 27 deletions
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index e5df6bf1b..bef978c94 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -288,20 +288,10 @@ PyArray_AsCArray(PyObject **op, void *ptr, npy_intp *dims, int nd,
NPY_NO_EXPORT int
PyArray_As1D(PyObject **op, char **ptr, int *d1, int typecode)
{
- npy_intp newd1;
- PyArray_Descr *descr;
- static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
-
/* 2008-07-14, 1.5 */
- if (DEPRECATE(msg) < 0) {
- return -1;
- }
- descr = PyArray_DescrFromType(typecode);
- if (PyArray_AsCArray(op, (void *)ptr, &newd1, 1, descr) == -1) {
- return -1;
- }
- *d1 = (int) newd1;
- return 0;
+ PyErr_SetString(PyExc_NotImplementedError,
+ "PyArray_As1D: use PyArray_AsCArray.");
+ return -1;
}
/*NUMPY_API
@@ -310,21 +300,10 @@ PyArray_As1D(PyObject **op, char **ptr, int *d1, int typecode)
NPY_NO_EXPORT int
PyArray_As2D(PyObject **op, char ***ptr, int *d1, int *d2, int typecode)
{
- npy_intp newdims[2];
- PyArray_Descr *descr;
- static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
-
/* 2008-07-14, 1.5 */
- if (DEPRECATE(msg) < 0) {
- return -1;
- }
- descr = PyArray_DescrFromType(typecode);
- if (PyArray_AsCArray(op, (void *)ptr, newdims, 2, descr) == -1) {
- return -1;
- }
- *d1 = (int ) newdims[0];
- *d2 = (int ) newdims[1];
- return 0;
+ PyErr_SetString(PyExc_NotImplementedError,
+ "PyArray_As2D: use PyArray_AsCArray.");
+ return -1;
}
/* End Deprecated */