mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-29 21:25:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 63856-63857,63859-63860 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Martin v. Löwis 2008-06-04 14:18:43 +00:00
parent 01a7d82432
commit 00709aaa3d
9 changed files with 254 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/bytesobject.c
View file

@ -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 */
};