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
........
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py
index 6032895..8840462 100644
--- a/Lib/test/test_struct.py
+++ b/Lib/test/test_struct.py
@@ -480,6 +480,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
@@ -508,8 +511,11 @@
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)