diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-08-25 23:19:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-08-25 23:19:30 (GMT) |
| commit | 039d0a00c82fa451bc837bc4561e855d36934074 (patch) | |
| tree | 62b7d093879f425b56c39916d1932228fcaea467 | |
| parent | 1061f18bebb808c95cde8c8a0a7d55e7ed87dbc6 (diff) | |
| download | cpython-039d0a00c82fa451bc837bc4561e855d36934074.zip cpython-039d0a00c82fa451bc837bc4561e855d36934074.tar.gz cpython-039d0a00c82fa451bc837bc4561e855d36934074.tar.bz2 | |
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
........
| -rw-r--r-- | Lib/test/test_types.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/typeobject.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index a56476b..d227ab1 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -666,6 +666,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(): run_unittest(TypesTests) @@ -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 #5319: Print an error if flushing stdout fails at interpreter shutdown. diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 3bf4e90..d2124f1 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -189,8 +189,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}, |