mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 21:33:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

sys.long_info attributes should be ints, not longs

Browse source
This commit is contained in:
Mark Dickinson 2009-04-02 18:39:37 +00:00
parent d3f03fa715
commit 48e3fd240f
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_sys.py
View file

@ -340,6 +340,8 @@ class SysModuleTest(unittest.TestCase):
self.assertEqual(len(sys.long_info), 2) self.assertEqual(len(sys.long_info), 2)
self.assert_(sys.long_info.bits_per_digit % 5 == 0) self.assert_(sys.long_info.bits_per_digit % 5 == 0)
self.assert_(sys.long_info.sizeof_digit >= 1) self.assert_(sys.long_info.sizeof_digit >= 1)
self.assertEqual(type(sys.long_info.bits_per_digit), int)
self.assertEqual(type(sys.long_info.sizeof_digit), int)
self.assert_(isinstance(sys.hexversion, int)) self.assert_(isinstance(sys.hexversion, int))
self.assert_(isinstance(sys.maxint, int)) self.assert_(isinstance(sys.maxint, int))
if test.test_support.have_unicode: if test.test_support.have_unicode:
@ -606,9 +608,9 @@ class SizeofTest(unittest.TestCase):
check(1L, size(vh) + self.longdigit) check(1L, size(vh) + self.longdigit)
check(-1L, size(vh) + self.longdigit) check(-1L, size(vh) + self.longdigit)
PyLong_BASE = 2**sys.long_info.bits_per_digit PyLong_BASE = 2**sys.long_info.bits_per_digit
check(PyLong_BASE, size(vh) + 2*self.longdigit) check(long(PyLong_BASE), size(vh) + 2*self.longdigit)
check(PyLong_BASE**2-1, size(vh) + 2*self.longdigit) check(long(PyLong_BASE**2-1), size(vh) + 2*self.longdigit)
check(PyLong_BASE**2, size(vh) + 3*self.longdigit) check(long(PyLong_BASE**2), size(vh) + 3*self.longdigit)
# module # module
check(unittest, size(h + 'P')) check(unittest, size(h + 'P'))
# None # None

6
Objects/longobject.c
View file

@ -3736,8 +3736,10 @@ PyLong_GetInfo(void)
long_info = PyStructSequence_New(&Long_InfoType); long_info = PyStructSequence_New(&Long_InfoType);
if (long_info == NULL) if (long_info == NULL)
return NULL; return NULL;
PyStructSequence_SET_ITEM(long_info, field++, PyLong_FromLong(PyLong_SHIFT)); PyStructSequence_SET_ITEM(long_info, field++,
PyStructSequence_SET_ITEM(long_info, field++, PyLong_FromLong(sizeof(digit))); PyInt_FromLong(PyLong_SHIFT));
PyStructSequence_SET_ITEM(long_info, field++,
PyInt_FromLong(sizeof(digit)));
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
Py_CLEAR(long_info); Py_CLEAR(long_info);
return NULL; return NULL;