diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-07-07 19:03:36 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-07-07 19:03:36 (GMT) |
| commit | 489113fd5f2e8e967d7c297697f951ec97c8b715 (patch) | |
| tree | 8030d03877cc4d1823444f7b57158ff9b98cb4db /Lib | |
| parent | ba303c82d117d81101308ee241dab02cf8864169 (diff) | |
| download | cpython-489113fd5f2e8e967d7c297697f951ec97c8b715.zip cpython-489113fd5f2e8e967d7c297697f951ec97c8b715.tar.gz cpython-489113fd5f2e8e967d7c297697f951ec97c8b715.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_struct.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index ce2c22d..1877192 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -491,6 +491,9 @@ class StructTest(unittest.TestCase): self.test_unpack_from(cls=buffer) def test_bool(self): + class ExplodingBool(object): + def __nonzero__(self): + raise IOError for prefix in tuple("<>!=")+('',): false = (), [], [], '', 0 true = [1], 'test', 5, -1, 0xffffffffL+1, 0xffffffff//2 @@ -519,8 +522,11 @@ class StructTest(unittest.TestCase): self.assertFalse(prefix, msg='encoded bool is not one byte: %r' %packed) - for c in '\x01\x7f\xff\x0f\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]) @unittest.skipUnless(IS32BIT, "Specific to 32bit machines") def test_crasher(self): |