mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-20 19:06:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 84320 via svnmerge from

Browse source 
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
........
This commit is contained in:
Benjamin Peterson 2010-08-25 23:19:30 +00:00
parent 1061f18beb
commit 039d0a00c8
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_types.py
View file

@ -666,6 +666,11 @@ class TypesTests(unittest.TestCase):
for code in 'xXobns': for code in 'xXobns':
self.assertRaises(ValueError, format, 0, ',' + code) self.assertRaises(ValueError, format, 0, ',' + code)
def test_internal_sizes(self):
self.assertGreater(object.__basicsize__, 0)
self.assertGreater(tuple.__itemsize__, 0)
def test_main(): def test_main():
run_unittest(TypesTests) run_unittest(TypesTests)

2
Misc/NEWS
View file

@ -14,6 +14,8 @@ Core and Builtins
- Restore GIL in nis_cat in case of error. - 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 - Issue #5319: Print an error if flushing stdout fails at interpreter
shutdown. shutdown.

4
Objects/typeobject.c
View file

@ -189,8 +189,8 @@ assign_version_tag(PyTypeObject *type)
static PyMemberDef type_members[] = { static PyMemberDef type_members[] = {
{"__basicsize__", T_INT, offsetof(PyTypeObject,tp_basicsize),READONLY}, {"__basicsize__", T_PYSSIZET, offsetof(PyTypeObject,tp_basicsize),READONLY},
{"__itemsize__", T_INT, offsetof(PyTypeObject, tp_itemsize), READONLY}, {"__itemsize__", T_PYSSIZET, offsetof(PyTypeObject, tp_itemsize), READONLY},
{"__flags__", T_LONG, offsetof(PyTypeObject, tp_flags), READONLY}, {"__flags__", T_LONG, offsetof(PyTypeObject, tp_flags), READONLY},
{"__weakrefoffset__", T_LONG, {"__weakrefoffset__", T_LONG,
offsetof(PyTypeObject, tp_weaklistoffset), READONLY}, offsetof(PyTypeObject, tp_weaklistoffset), READONLY},