[Python-checkins] r82630 - in python/branches/py3k: Lib/test/test_struct.py Modules/_struct.c
benjamin.peterson
python-checkins at python.org
Wed Jul 7 20:54:59 CEST 2010
Author: benjamin.peterson
Date: Wed Jul 7 20:54:59 2010
New Revision: 82630
Log:
don't ignore exceptions from PyObject_IsTrue
Modified:
python/branches/py3k/Lib/test/test_struct.py
python/branches/py3k/Modules/_struct.c
Modified: python/branches/py3k/Lib/test/test_struct.py
==============================================================================
--- python/branches/py3k/Lib/test/test_struct.py (original)
+++ python/branches/py3k/Lib/test/test_struct.py Wed Jul 7 20:54:59 2010
@@ -475,6 +475,9 @@
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
@@ -503,6 +506,9 @@
self.assertFalse(prefix, msg='encoded bool is not one byte: %r'
%packed)
+ 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])
Modified: python/branches/py3k/Modules/_struct.c
==============================================================================
--- python/branches/py3k/Modules/_struct.c (original)
+++ python/branches/py3k/Modules/_struct.c Wed Jul 7 20:54:59 2010
@@ -591,9 +591,13 @@
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;
}
@@ -865,6 +869,8 @@
{
char y;
y = PyObject_IsTrue(v);
+ if (y < 0)
+ return -1;
memcpy(p, (char *)&y, sizeof y);
return 0;
}
More information about the Python-checkins
mailing list