diff options
| author | Walter Dörwald <walter@livinglogic.de> | 2007-05-03 21:05:51 (GMT) |
|---|---|---|
| committer | Walter Dörwald <walter@livinglogic.de> | 2007-05-03 21:05:51 (GMT) |
| commit | aa97f0496412ed834aada921e29588ed16d68e40 (patch) | |
| tree | cfe74cb3cd3ed5a27cbcfa404ea9fc8c73fd63f1 /Lib/test/test_struct.py | |
| parent | 5d7a7001d9df605606b249b3e11707d6d1ad2e3d (diff) | |
| download | cpython-aa97f0496412ed834aada921e29588ed16d68e40.zip cpython-aa97f0496412ed834aada921e29588ed16d68e40.tar.gz cpython-aa97f0496412ed834aada921e29588ed16d68e40.tar.bz2 | |
Fix various spots where int/long and str/unicode unification
lead to type checks like isinstance(foo, (str, str)) or
isinstance(foo, (int, int)).
Diffstat (limited to 'Lib/test/test_struct.py')
| -rw-r--r-- | Lib/test/test_struct.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index b62d74c..c3df222 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -492,12 +492,11 @@ test_705836() def test_1229380(): import sys for endian in ('', '>', '<'): - for cls in (int, int): - for fmt in ('B', 'H', 'I', 'L'): - deprecated_err(struct.pack, endian + fmt, cls(-1)) + for fmt in ('B', 'H', 'I', 'L'): + deprecated_err(struct.pack, endian + fmt, -1) - deprecated_err(struct.pack, endian + 'B', cls(300)) - deprecated_err(struct.pack, endian + 'H', cls(70000)) + deprecated_err(struct.pack, endian + 'B', 300) + deprecated_err(struct.pack, endian + 'H', 70000) deprecated_err(struct.pack, endian + 'I', sys.maxint * 4) deprecated_err(struct.pack, endian + 'L', sys.maxint * 4) |