summaryrefslogtreecommitdiff
path: root/Objects/classobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-24 18:10:20 +0000
committerBenjamin Peterson <benjamin@python.org>2008-08-24 18:10:20 +0000
commit712ee923092ef1b47c72914c5e2950be2f05f527 (patch)
tree9d6052ea7c1f7dc65c45568f847f762de71f8871 /Objects/classobject.c
parenta403e4141afb5dfff41d5844e32d94bc7d341c17 (diff)
downloadcpython-git-712ee923092ef1b47c72914c5e2950be2f05f527.tar.gz
generate py3k warnings on __getslice__, __delslice__, and __setslice__
Reviewer: Brett Cannon
Diffstat (limited to 'Objects/classobject.c')
-rw-r--r--Objects/classobject.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c
index caf6b3e7b0..7d3d0480b5 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -1174,8 +1174,15 @@ instance_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j)
if (func == NULL)
return NULL;
arg = Py_BuildValue("(N)", _PySlice_FromIndices(i, j));
- } else
+ }
+ else {
+ if (PyErr_WarnPy3k("in 3.x, __getslice__ has been removed; "
+ "use __getitem__", 1) < 0) {
+ Py_DECREF(func);
+ return NULL;
+ }
arg = Py_BuildValue("(nn)", i, j);
+ }
if (arg == NULL) {
Py_DECREF(func);
@@ -1257,8 +1264,15 @@ instance_ass_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j, PyObject
arg = Py_BuildValue("(N)",
_PySlice_FromIndices(i, j));
- } else
+ }
+ else {
+ if (PyErr_WarnPy3k("in 3.x, __delslice__ has been "
+ "removed; use __delitem__", 1) < 0) {
+ Py_DECREF(func);
+ return -1;
+ }
arg = Py_BuildValue("(nn)", i, j);
+ }
}
else {
if (setslicestr == NULL) {
@@ -1284,8 +1298,15 @@ instance_ass_slice(PyInstanceObject *inst, Py_ssize_t i, Py_ssize_t j, PyObject
arg = Py_BuildValue("(NO)",
_PySlice_FromIndices(i, j), value);
- } else
+ }
+ else {
+ if (PyErr_WarnPy3k("in 3.x, __setslice__ has been "
+ "removed; use __setitem__", 1) < 0) {
+ Py_DECREF(func);
+ return -1;
+ }
arg = Py_BuildValue("(nnO)", i, j, value);
+ }
}
if (arg == NULL) {
Py_DECREF(func);