[Python-checkins] r82742 - in python/branches/release27-maint: Lib/test/test_struct.py
benjamin.peterson
python-checkins at python.org
Fri Jul 9 15:33:03 CEST 2010
Author: benjamin.peterson
Date: Fri Jul 9 15:33:03 2010
New Revision: 82742
Log:
Merged revisions 82739,82741 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r82739 | benjamin.peterson | 2010-07-09 08:28:42 -0500 (Fri, 09 Jul 2010) | 1 line
allow more exceptions
........
r82741 | benjamin.peterson | 2010-07-09 08:31:11 -0500 (Fri, 09 Jul 2010) | 1 line
wrap
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Lib/test/test_struct.py
Modified: python/branches/release27-maint/Lib/test/test_struct.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_struct.py (original)
+++ python/branches/release27-maint/Lib/test/test_struct.py Fri Jul 9 15:33:03 2010
@@ -62,8 +62,8 @@
self.assertRaises(struct.error, struct.pack, 'iii', 3)
self.assertRaises(struct.error, struct.pack, 'i', 3, 3, 3)
- self.assertRaises(struct.error, struct.pack, 'i', 'foo')
- self.assertRaises(struct.error, struct.pack, 'P', 'foo')
+ self.assertRaises((TypeError, struct.error), struct.pack, 'i', 'foo')
+ self.assertRaises((TypeError, struct.error), struct.pack, 'P', 'foo')
self.assertRaises(struct.error, struct.unpack, 'd', 'flap')
s = struct.pack('ii', 1, 2)
self.assertRaises(struct.error, struct.unpack, 'iii', s)
@@ -458,7 +458,8 @@
# Test bogus offset (issue 3694)
sb = small_buf
- self.assertRaises(TypeError, struct.pack_into, b'1', sb, None)
+ self.assertRaises((TypeError, struct.error), struct.pack_into, b'', sb,
+ None)
def test_pack_into_fn(self):
test_string = 'Reykjavik rocks, eow!'
More information about the Python-checkins
mailing list