diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-06-04 14:18:43 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-06-04 14:18:43 (GMT) |
| commit | 00709aaa3dc7da374e94a3ede8e05603e8a95066 (patch) | |
| tree | 50acc73f0d94cd4294b8a6a0f2efdb03cb43f409 /Objects/dictobject.c | |
| parent | 01a7d82432edbf297c32289737a40d7103a03527 (diff) | |
| download | cpython-00709aaa3dc7da374e94a3ede8e05603e8a95066.zip cpython-00709aaa3dc7da374e94a3ede8e05603e8a95066.tar.gz cpython-00709aaa3dc7da374e94a3ede8e05603e8a95066.tar.bz2 | |
Merged revisions 63856-63857,63859-63860 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63856 | robert.schuppenies | 2008-06-01 18:16:17 +0200 (So, 01 Jun 2008) | 2 lines
Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes.
........
r63859 | georg.brandl | 2008-06-01 18:42:16 +0200 (So, 01 Jun 2008) | 2 lines
Some style nits. Also clarify in the docstrings what __sizeof__ does.
........
r63860 | georg.brandl | 2008-06-01 19:05:56 +0200 (So, 01 Jun 2008) | 2 lines
Fix test_descrtut.
........
Diffstat (limited to 'Objects/dictobject.c')
| -rw-r--r-- | Objects/dictobject.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index fc2c8f0..b4f9182 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -1840,11 +1840,28 @@ dict_tp_clear(PyObject *op) static PyObject *dictiter_new(PyDictObject *, PyTypeObject *); +static PyObject * +dict_sizeof(PyDictObject *mp) +{ + Py_ssize_t res; + + res = sizeof(PyDictObject) + sizeof(mp->ma_table); + if (mp->ma_table != mp->ma_smalltable) + res = res + (mp->ma_mask + 1) * sizeof(PyDictEntry); + return PyLong_FromSsize_t(res); +} + +PyDoc_STRVAR(has_key__doc__, +"D.has_key(k) -> True if D has a key k, else False"); + PyDoc_STRVAR(contains__doc__, "D.__contains__(k) -> True if D has a key k, else False"); PyDoc_STRVAR(getitem__doc__, "x.__getitem__(y) <==> x[y]"); +PyDoc_STRVAR(sizeof__doc__, +"D.__sizeof__() -> size of D in memory, in bytes"); + PyDoc_STRVAR(get__doc__, "D.get(k[,d]) -> D[k] if k in D, else d. d defaults to None."); @@ -1890,6 +1907,8 @@ static PyMethodDef mapp_methods[] = { contains__doc__}, {"__getitem__", (PyCFunction)dict_subscript, METH_O | METH_COEXIST, getitem__doc__}, + {"__sizeof__", (PyCFunction)dict_sizeof, METH_NOARGS, + sizeof__doc__}, {"get", (PyCFunction)dict_get, METH_VARARGS, get__doc__}, {"setdefault", (PyCFunction)dict_setdefault, METH_VARARGS, |