[Python-checkins] r84320 - in python/branches/py3k: Lib/test/test_types.py Misc/NEWS Objects/typeobject.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Aug 26 01:13:17 2010
New Revision: 84320

Log:
basicsize and itemsize are Py_ssize_t #9688

Modified:
   python/branches/py3k/Lib/test/test_types.py
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Objects/typeobject.c

Modified: python/branches/py3k/Lib/test/test_types.py
==============================================================================
--- python/branches/py3k/Lib/test/test_types.py	(original)
+++ python/branches/py3k/Lib/test/test_types.py	Thu Aug 26 01:13:17 2010
@@ -550,6 +550,11 @@
         for code in 'xXobns':
             self.assertRaises(ValueError, format, 0, ',' + code)
 
+    def test_internal_sizes(self):
+        self.assertGreater(object.__basicsize__, 0)
+        self.assertGreater(tuple.__itemsize__, 0)
+
+
 def test_main():
     run_unittest(TypesTests)
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Thu Aug 26 01:13:17 2010
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t.
+
 - Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h,
   to match the pyconfig.h generated by configure on other systems.
 

Modified: python/branches/py3k/Objects/typeobject.c
==============================================================================
--- python/branches/py3k/Objects/typeobject.c	(original)
+++ python/branches/py3k/Objects/typeobject.c	Thu Aug 26 01:13:17 2010
@@ -189,8 +189,8 @@
 
 
 static PyMemberDef type_members[] = {
-    {"__basicsize__", T_INT, offsetof(PyTypeObject,tp_basicsize),READONLY},
-    {"__itemsize__", T_INT, offsetof(PyTypeObject, tp_itemsize), READONLY},
+    {"__basicsize__", T_PYSSIZET, offsetof(PyTypeObject,tp_basicsize),READONLY},
+    {"__itemsize__", T_PYSSIZET, offsetof(PyTypeObject, tp_itemsize), READONLY},
     {"__flags__", T_LONG, offsetof(PyTypeObject, tp_flags), READONLY},
     {"__weakrefoffset__", T_LONG,
      offsetof(PyTypeObject, tp_weaklistoffset), READONLY},