mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

generate py3k warnings on __getslice__, __delslice__, and __setslice__

Browse source 
Reviewer: Brett Cannon
This commit is contained in:
Benjamin Peterson 2008-08-24 18:10:20 +00:00
parent a403e4141a
commit 712ee92309
4 changed files with 72 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Objects/typeobject.c
View file

@ -4897,7 +4897,17 @@ slot_sq_item(PyObject *self, Py_ssize_t i)
return NULL;
}
SLOT2(slot_sq_slice, "__getslice__", Py_ssize_t, Py_ssize_t, "nn")
static PyObject*
slot_sq_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j)
{
static PyObject *getslice_str;
if (PyErr_WarnPy3k("in 3.x, __getslice__ has been removed; "
"use __getitem__", 1) < 0)
return NULL;
return call_method(self, "__getslice__", &getslice_str,
"nn", i, j);
}
static int
slot_sq_ass_item(PyObject *self, Py_ssize_t index, PyObject *value)
@ -4922,13 +4932,21 @@ slot_sq_ass_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j, PyObject *value)
{
PyObject *res;
static PyObject *delslice_str, *setslice_str;
if (value == NULL)
if (value == NULL) {
if (PyErr_WarnPy3k("in 3.x, __delslice__ has been removed; "
"use __delitem__", 1) < 0)
return -1;
res = call_method(self, "__delslice__", &delslice_str,
"(nn)", i, j);
else
}
else {
if (PyErr_WarnPy3k("in 3.x, __setslice__ has been removed; "
"use __setitem__", 1) < 0)
return -1;
res = call_method(self, "__setslice__", &setslice_str,
"(nnO)", i, j, value);
"(nnO)", i, j, value);
}
if (res == NULL)
return -1;
Py_DECREF(res);