traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 82628,82630 via svnmerge from 

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

........
  r82628 | benjamin.peterson | 2010-07-07 13:44:05 -0500 (Wed, 07 Jul 2010) | 1 line

  this needn't be in the loop
........
  r82630 | benjamin.peterson | 2010-07-07 13:54:59 -0500 (Wed, 07 Jul 2010) | 1 line

  don't ignore exceptions from PyObject_IsTrue
........
This commit is contained in:
Benjamin Peterson 2010-07-07 22:46:00 +00:00
parent ddd46ceeb0
commit f092c7c1d7
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/test/test_struct.py
View File

@ -480,6 +480,9 @@ class StructTest(unittest.TestCase):
self.assertEqual(value, 0x12345678)
def test_bool(self):
class ExplodingBool(object):
def __bool__(self):
raise IOError
for prefix in tuple("<>!=")+('',):
false = (), [], [], '', 0
true = [1], 'test', 5, -1, 0xffffffff+1, 0xffffffff/2
@ -508,8 +511,11 @@ class StructTest(unittest.TestCase):
self.assertFalse(prefix, msg='encoded bool is not one byte: %r'
%packed)
for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']:
self.assertTrue(struct.unpack('>?', c)[0])
self.assertRaises(IOError, struct.pack, prefix + '?',
ExplodingBool())
for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']:
self.assertTrue(struct.unpack('>?', c)[0])
def test_count_overflow(self):
hugecount = '{}b'.format(sys.maxsize+1)

10
Modules/_struct.c
View File

@ -580,9 +580,13 @@ np_ulonglong(char *p, PyObject *v, const formatdef *f)
static int
np_bool(char *p, PyObject *v, const formatdef *f)
{
BOOL_TYPE y;
int y;
BOOL_TYPE x;
y = PyObject_IsTrue(v);
memcpy(p, (char *)&y, sizeof y);
if (y < 0)
return -1;
x = y;
memcpy(p, (char *)&x, sizeof x);
return 0;
}
@ -854,6 +858,8 @@ bp_bool(char *p, PyObject *v, const formatdef *f)
{
char y;
y = PyObject_IsTrue(v);
if (y < 0)
return -1;
memcpy(p, (char *)&y, sizeof y);
return 0;
}