From 17a74c395eafa98e7dcdeaa8a48110e95b142b66 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Sat, 9 Feb 2008 04:37:49 +0000 Subject: Add -3 warnings that set.copy(), dict.copy(), and defaultdict.copy() will go away in Py3.x --- Modules/_collectionsmodule.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Modules/_collectionsmodule.c') diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 67700de728..9cdabdf3d1 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -1186,12 +1186,22 @@ defdict_copy(defdictobject *dd) { /* This calls the object's class. That only works for subclasses whose class constructor has the same signature. Subclasses that - define a different constructor signature must override copy(). + define a different constructor signature must override __copy__(). */ return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), dd->default_factory, dd, NULL); } +static PyObject * +defdict_copy_method(defdictobject *dd) +{ + if (Py_Py3kWarningFlag && + PyErr_Warn(PyExc_DeprecationWarning, + "defaultdict.copy() not supported in 3.x") < 0) + return NULL; + return defdict_copy(dd); +} + static PyObject * defdict_reduce(defdictobject *dd) { @@ -1241,7 +1251,7 @@ defdict_reduce(defdictobject *dd) static PyMethodDef defdict_methods[] = { {"__missing__", (PyCFunction)defdict_missing, METH_O, defdict_missing_doc}, - {"copy", (PyCFunction)defdict_copy, METH_NOARGS, + {"copy", (PyCFunction)defdict_copy_method, METH_NOARGS, defdict_copy_doc}, {"__copy__", (PyCFunction)defdict_copy, METH_NOARGS, defdict_copy_doc}, -- cgit v1.2.1