Merged revisions 84320 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84320 | benjamin.peterson | 2010-08-25 18:13:17 -0500 (Wed, 25 Aug 2010) | 1 line

  basicsize and itemsize are Py_ssize_t #9688
........

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 21e8b960ee616f149c7681aff2a9f3ddd5607982..60f6d2f1e29d851ce05a78ec0043198afc4c5b42 100644 (file)
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -741,6 +741,11 @@ class TypesTests(unittest.TestCase):
         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():
     with check_py3k_warnings(
             ("buffer.. not supported", DeprecationWarning),

diff --git a/Misc/NEWS b/Misc/NEWS
index ed5f44255168d96b393d0318c25caec831a09aa3..fcd4ae00617c0a0821c13a6984674a4fe3bdf588 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,6 +14,8 @@ Core and Builtins
 
 - Restore GIL in nis_cat in case of error.
 
+- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t.
+
 - Issue #8530: Prevent stringlib fastsearch from reading beyond the front
   of an array.
 

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 493987aeb8f4a2a8927c3da2c4f3365348f636eb..d26216812037ac128abfae04796ae0ad2108d143 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -188,8 +188,8 @@ assign_version_tag(PyTypeObject *type)
 
 
 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},