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/bytesobject.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/bytesobject.c')
| -rw-r--r-- | Objects/bytesobject.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c index 3f22e7c..ab6207b 100644 --- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -2784,6 +2784,17 @@ string_fromhex(PyObject *cls, PyObject *args) return NULL; } +PyDoc_STRVAR(sizeof__doc__, +"S.__sizeof__() -> size of S in memory, in bytes"); + +static PyObject * +string_sizeof(PyBytesObject *v) +{ + Py_ssize_t res; + res = sizeof(PyBytesObject) + Py_SIZE(v) * Py_TYPE(v)->tp_itemsize; + return PyLong_FromSsize_t(res); +} + static PyObject * string_getnewargs(PyBytesObject *v) @@ -2848,6 +2859,8 @@ string_methods[] = { translate__doc__}, {"upper", (PyCFunction)stringlib_upper, METH_NOARGS, _Py_upper__doc__}, {"zfill", (PyCFunction)stringlib_zfill, METH_VARARGS, zfill__doc__}, + {"__sizeof__", (PyCFunction)string_sizeof, METH_NOARGS, + sizeof__doc__}, {NULL, NULL} /* sentinel */ }; |