mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 12:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

dict.copy() rises from the ashes. Revert r60687.

Browse source
This commit is contained in:
Raymond Hettinger 2008-02-12 19:05:36 +00:00
parent dad88dc159
commit a37430a0ce
3 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/_collectionsmodule.c
View file

@ -1186,22 +1186,12 @@ 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)
{
@ -1251,7 +1241,7 @@ defdict_reduce(defdictobject *dd)
static PyMethodDef defdict_methods[] = {
{"__missing__", (PyCFunction)defdict_missing, METH_O,
defdict_missing_doc},
{"copy", (PyCFunction)defdict_copy_method, METH_NOARGS,
{"copy", (PyCFunction)defdict_copy, METH_NOARGS,
defdict_copy_doc},
{"__copy__", (PyCFunction)defdict_copy, METH_NOARGS,
defdict_copy_doc},