Add gc header size to returned sizeof information

Lib/test/test_sys.py

 # -*- coding: iso-8859-1 -*-
 import unittest, test.test_support
 import sys, cStringIO, os
 import struct
 
 class SysModuleTest(unittest.TestCase):
 
     def test_original_displayhook(self):
         import __builtin__
         savestdout = sys.stdout
@@ skipping 404 matching lines @@
         self.H = len(struct.pack('H', 0))
         self.i = len(struct.pack('i', 0))
         self.l = len(struct.pack('l', 0))
         self.P = len(struct.pack('P', 0))
         # due to missing size_t information from struct, it is assumed that
         # sizeof(Py_ssize_t) = sizeof(void*)
         self.header = 'lP'
         if hasattr(sys, "gettotalrefcount"):
             self.header += '2P'
         import _testcapi
-        self.gc_headsize = _testcapi.GC_HEADSIZE
+        self.gc_headsize = _testcapi.SIZEOF_PYGC_HEAD
         self.file = open(test.test_support.TESTFN, 'wb')
 
     def tearDown(self):
         self.file.close()
         test.test_support.unlink(test.test_support.TESTFN)
 
     def check_sizeof(self, o, size, size2=None):
         """Check size of o. Possible are size and optionally size2)."""
         result = sys.getsizeof(o)
         # add GC header size
-        if type(o).__flags__ & SizeofTest.TPFLAGS_HAVE_GC:

[Martin v. Löwis, 2008/06/26 18:05:31]

alternatively: self.TPFLAGS_HAVE_GC

+        if type(o).__flags__ & self.TPFLAGS_HAVE_GC:
             size += self.gc_headsize
             if size2 != None:
                 size2 += self.gc_headsize
         msg = 'wrong size for %s: got %d, expected ' % (type(o), result)
         if (size2 != None) and (result != size):
             self.assertEqual(result, size2, msg + str(size2))
         else:
             self.assertEqual(result, size, msg + str(size))
 
     def calcsize(self, fmt):
         """Wrapper around struct.calcsize which enforces the alignment of the
         end of a structure to the alignment requirement of pointer.
 
         Note: This wrapper should only be used if a pointer member is included
         and no member with a size larger than a pointer exists.
         """
         return struct.calcsize(fmt + '0P')
 
     def test_gc_head_size(self):
         # Check that the gc header size is added to objects tracked by the gc.
         h = self.header
         size = self.calcsize
         gc_header_size = self.gc_headsize
         # bool objects are not gc tracked
         self.assertEqual(sys.getsizeof(True), size(h + 'l'))
+        self.assertEqual(sys.getsizeof(True, gc_head=True), size(h + 'l'))
+        self.assertEqual(sys.getsizeof(True, gc_head=False), size(h + 'l'))
         # but lists are
         self.assertEqual(sys.getsizeof([]), size(h + 'P PP') + gc_header_size)
-
+        self.assertEqual(sys.getsizeof([], gc_head=False), size(h + 'P PP'))
+
+    def test_default(self):
+        h = self.header
+        size = self.calcsize
+        self.assertEqual(sys.getsizeof(True, -1), size(h + 'l'))
+        self.assertEqual(sys.getsizeof(True, -1, gc_head=True), size(h + 'l'))
+        
     def test_standardtypes(self):
         h = self.header
         size = self.calcsize
         # bool
         self.check_sizeof(True, size(h + 'l'))
         # buffer
         self.check_sizeof(buffer(''), size(h + '2P2Pil'))
         # cell
         def get_cell():
             x = 42
@@ skipping 104 matching lines @@
         self.check_sizeof((1,2,3), size(h) + 3*self.P)
 
 
 def test_main():
     test_classes = (SysModuleTest, SizeofTest)
 
     test.test_support.run_unittest(*test_classes)
 
 if __name__ == "__main__":
     test_main()