summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descrtut.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-06-04 14:18:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-06-04 14:18:43 (GMT)
commit00709aaa3dc7da374e94a3ede8e05603e8a95066 (patch)
tree50acc73f0d94cd4294b8a6a0f2efdb03cb43f409 /Lib/test/test_descrtut.py
parent01a7d82432edbf297c32289737a40d7103a03527 (diff)
downloadcpython-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 'Lib/test/test_descrtut.py')
-rw-r--r--Lib/test/test_descrtut.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py
index bd298bd..11a3422 100644
--- a/Lib/test/test_descrtut.py
+++ b/Lib/test/test_descrtut.py
@@ -195,6 +195,7 @@ You can get the information from the list type:
'__rmul__',
'__setattr__',
'__setitem__',
+ '__sizeof__',
'__str__',
'__subclasshook__',
'append',