diff options
| author | Guido van Rossum <guido@python.org> | 1997-06-02 17:13:37 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-06-02 17:13:37 (GMT) |
| commit | a8d5131d5792cfbde08c0e1ab4c5da412b439b75 (patch) | |
| tree | 1ef40e89a67abe444db01df3c1b2d45263cb912d /Objects | |
| parent | c22eb01bfe37b21fa6d1bdf002c321e84a05ccbd (diff) | |
| download | cpython-a8d5131d5792cfbde08c0e1ab4c5da412b439b75.zip cpython-a8d5131d5792cfbde08c0e1ab4c5da412b439b75.tar.gz cpython-a8d5131d5792cfbde08c0e1ab4c5da412b439b75.tar.bz2 | |
Renamed dict.absorb() (too spungy) to dict.update().
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 408bd8f..43d962c 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -675,7 +675,7 @@ dict_items(mp, args) } static PyObject * -dict_absorb(mp, args) +dict_update(mp, args) register dictobject *mp; PyObject *args; { @@ -685,7 +685,7 @@ dict_absorb(mp, args) if (!PyArg_Parse(args, "O!", &PyDict_Type, &other)) return NULL; if (other == mp) - goto done; /* a.absorb(a); nothing to do */ + goto done; /* a.update(a); nothing to do */ /* Do one big resize at the start, rather than incrementally resizing as we insert new items. Expect that there will be no (or few) overlapping keys. */ @@ -963,7 +963,7 @@ dict_clear(mp, args) } static PyMethodDef mapp_methods[] = { - {"absorb", (PyCFunction)dict_absorb}, + {"update", (PyCFunction)dict_update}, {"clear", (PyCFunction)dict_clear}, {"copy", (PyCFunction)dict_copy}, {"has_key", (PyCFunction)dict_has_key}, |