Mercurial > cpython-lru_cache-weakref
annotate Lib/test/test_struct.py @ 70626:aa07c1237f4e
(Merge 3.2) Issue #12016: Reindent decoders of HK and JP codecs
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 03 Jun 2011 23:34:32 +0200 |
| parents | dc245d681901 |
| children | 3e7b517e1b68 db3e15017172 |
| rev | line source |
|---|---|
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
1 import array |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
2 import unittest |
| 4706 | 3 import struct |
|
59366
81477192cf7a
Remove unused imports & clean up sys imports in test_struct.
Mark Dickinson <dickinsm@gmail.com>
parents:
55593
diff
changeset
|
4 import sys |
| 4706 | 5 |
|
59366
81477192cf7a
Remove unused imports & clean up sys imports in test_struct.
Mark Dickinson <dickinsm@gmail.com>
parents:
55593
diff
changeset
|
6 from test.support import run_unittest |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
7 |
|
18111
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
8 ISBIGENDIAN = sys.byteorder == "big" |
|
48321
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
9 IS32BIT = sys.maxsize == 0x7fffffff |
|
18111
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
10 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
11 integer_codes = 'b', 'B', 'h', 'H', 'i', 'I', 'l', 'L', 'q', 'Q' |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
12 byteorders = '', '@', '=', '<', '>', '!' |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
13 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
14 # Native 'q' packing isn't available on systems that don't have the C |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
15 # long long type. |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
16 try: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
17 struct.pack('q', 5) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
18 except struct.error: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
19 HAVE_LONG_LONG = False |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
20 else: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
21 HAVE_LONG_LONG = True |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
22 |
|
18111
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
23 def string_reverse(s): |
|
41891
b7cfb3fd8db0
Make struct tests pass.
Guido van Rossum <guido@python.org>
parents:
41642
diff
changeset
|
24 return s[::-1] |
|
18111
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
25 |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
26 def bigendian_to_native(value): |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
27 if ISBIGENDIAN: |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
28 return value |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
29 else: |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
30 return string_reverse(value) |
|
099ae4918069
Generalize the new qQ std-mode tests to all int codes (bBhHiIlLqQ).
Tim Peters <tim.peters@gmail.com>
parents:
18094
diff
changeset
|
31 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
32 class StructTest(unittest.TestCase): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
33 def test_isbigendian(self): |
|
48325
5f9435317de1
Another merge error, seen on bigendian machines
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
48321
diff
changeset
|
34 self.assertEqual((struct.pack('=i', 1)[0] == 0), ISBIGENDIAN) |
| 4706 | 35 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
36 def test_consistence(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
37 self.assertRaises(struct.error, struct.calcsize, 'Z') |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
38 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
39 sz = struct.calcsize('i') |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
40 self.assertEqual(sz * 3, struct.calcsize('iii')) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
41 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
42 fmt = 'cbxxxxxxhhhhiillffd?' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
43 fmt3 = '3c3b18x12h6i6l6f3d3?' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
44 sz = struct.calcsize(fmt) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
45 sz3 = struct.calcsize(fmt3) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
46 self.assertEqual(sz * 3, sz3) |
| 4706 | 47 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
48 self.assertRaises(struct.error, struct.pack, 'iii', 3) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
49 self.assertRaises(struct.error, struct.pack, 'i', 3, 3, 3) |
|
62894
10c0630f1c14
allow more exceptions
Benjamin Peterson <benjamin@python.org>
parents:
62890
diff
changeset
|
50 self.assertRaises((TypeError, struct.error), struct.pack, 'i', 'foo') |
|
10c0630f1c14
allow more exceptions
Benjamin Peterson <benjamin@python.org>
parents:
62890
diff
changeset
|
51 self.assertRaises((TypeError, struct.error), struct.pack, 'P', 'foo') |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
52 self.assertRaises(struct.error, struct.unpack, 'd', b'flap') |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
53 s = struct.pack('ii', 1, 2) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
54 self.assertRaises(struct.error, struct.unpack, 'iii', s) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
55 self.assertRaises(struct.error, struct.unpack, 'i', s) |
|
4847
d53812d68408
Exercise the new feature set somewhat.
Guido van Rossum <guido@python.org>
parents:
4706
diff
changeset
|
56 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
57 def test_transitiveness(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
58 c = b'a' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
59 b = 1 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
60 h = 255 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
61 i = 65535 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
62 l = 65536 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
63 f = 3.1415 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
64 d = 3.1415 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
65 t = True |
|
4847
d53812d68408
Exercise the new feature set somewhat.
Guido van Rossum <guido@python.org>
parents:
4706
diff
changeset
|
66 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
67 for prefix in ('', '@', '<', '>', '=', '!'): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
68 for format in ('xcbhilfd?', 'xcBHILfd?'): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
69 format = prefix + format |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
70 s = struct.pack(format, c, b, h, i, l, f, d, t) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
71 cp, bp, hp, ip, lp, fp, dp, tp = struct.unpack(format, s) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
72 self.assertEqual(cp, c) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
73 self.assertEqual(bp, b) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
74 self.assertEqual(hp, h) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
75 self.assertEqual(ip, i) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
76 self.assertEqual(lp, l) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
77 self.assertEqual(int(100 * fp), int(100 * f)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
78 self.assertEqual(int(100 * dp), int(100 * d)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
79 self.assertEqual(tp, t) |
|
4847
d53812d68408
Exercise the new feature set somewhat.
Guido van Rossum <guido@python.org>
parents:
4706
diff
changeset
|
80 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
81 def test_new_features(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
82 # Test some of the new features in detail |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
83 # (format, argument, big-endian result, little-endian result, asymmetric) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
84 tests = [ |
|
67181
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
85 ('c', b'a', b'a', b'a', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
86 ('xc', b'a', b'\0a', b'\0a', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
87 ('cx', b'a', b'a\0', b'a\0', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
88 ('s', b'a', b'a', b'a', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
89 ('0s', b'helloworld', b'', b'', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
90 ('1s', b'helloworld', b'h', b'h', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
91 ('9s', b'helloworld', b'helloworl', b'helloworl', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
92 ('10s', b'helloworld', b'helloworld', b'helloworld', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
93 ('11s', b'helloworld', b'helloworld\0', b'helloworld\0', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
94 ('20s', b'helloworld', b'helloworld'+10*b'\0', b'helloworld'+10*b'\0', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
95 ('b', 7, b'\7', b'\7', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
96 ('b', -7, b'\371', b'\371', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
97 ('B', 7, b'\7', b'\7', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
98 ('B', 249, b'\371', b'\371', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
99 ('h', 700, b'\002\274', b'\274\002', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
100 ('h', -700, b'\375D', b'D\375', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
101 ('H', 700, b'\002\274', b'\274\002', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
102 ('H', 0x10000-700, b'\375D', b'D\375', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
103 ('i', 70000000, b'\004,\035\200', b'\200\035,\004', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
104 ('i', -70000000, b'\373\323\342\200', b'\200\342\323\373', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
105 ('I', 70000000, b'\004,\035\200', b'\200\035,\004', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
106 ('I', 0x100000000-70000000, b'\373\323\342\200', b'\200\342\323\373', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
107 ('l', 70000000, b'\004,\035\200', b'\200\035,\004', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
108 ('l', -70000000, b'\373\323\342\200', b'\200\342\323\373', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
109 ('L', 70000000, b'\004,\035\200', b'\200\035,\004', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
110 ('L', 0x100000000-70000000, b'\373\323\342\200', b'\200\342\323\373', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
111 ('f', 2.0, b'@\000\000\000', b'\000\000\000@', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
112 ('d', 2.0, b'@\000\000\000\000\000\000\000', |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
113 b'\000\000\000\000\000\000\000@', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
114 ('f', -2.0, b'\300\000\000\000', b'\000\000\000\300', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
115 ('d', -2.0, b'\300\000\000\000\000\000\000\000', |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
116 b'\000\000\000\000\000\000\000\300', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
117 ('?', 0, b'\0', b'\0', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
118 ('?', 3, b'\1', b'\1', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
119 ('?', True, b'\1', b'\1', 0), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
120 ('?', [], b'\0', b'\0', 1), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
121 ('?', (1,), b'\1', b'\1', 1), |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
122 ] |
|
18069
8e187740aa96
Initial support for 'q' and 'Q' struct format codes: for now, only in
Tim Peters <tim.peters@gmail.com>
parents:
15540
diff
changeset
|
123 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
124 for fmt, arg, big, lil, asy in tests: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
125 for (xfmt, exp) in [('>'+fmt, big), ('!'+fmt, big), ('<'+fmt, lil), |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
126 ('='+fmt, ISBIGENDIAN and big or lil)]: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
127 res = struct.pack(xfmt, arg) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
128 self.assertEqual(res, exp) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
129 self.assertEqual(struct.calcsize(xfmt), len(res)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
130 rev = struct.unpack(xfmt, res)[0] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
131 if rev != arg: |
|
55593
0bb232078b8c
Merged revisions 73715 via svnmerge from
Georg Brandl <georg@python.org>
parents:
53271
diff
changeset
|
132 self.assertTrue(asy) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
133 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
134 def test_calcsize(self): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
135 expected_size = { |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
136 'b': 1, 'B': 1, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
137 'h': 2, 'H': 2, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
138 'i': 4, 'I': 4, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
139 'l': 4, 'L': 4, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
140 'q': 8, 'Q': 8, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
141 } |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
142 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
143 # standard integer sizes |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
144 for code in integer_codes: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
145 for byteorder in '=', '<', '>', '!': |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
146 format = byteorder+code |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
147 size = struct.calcsize(format) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
148 self.assertEqual(size, expected_size[code]) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
149 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
150 # native integer sizes |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
151 native_pairs = 'bB', 'hH', 'iI', 'lL' |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
152 if HAVE_LONG_LONG: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
153 native_pairs += 'qQ', |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
154 for format_pair in native_pairs: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
155 for byteorder in '', '@': |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
156 signed_size = struct.calcsize(byteorder + format_pair[0]) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
157 unsigned_size = struct.calcsize(byteorder + format_pair[1]) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
158 self.assertEqual(signed_size, unsigned_size) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
159 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
160 # bounds for native integer sizes |
|
60305
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
161 self.assertEqual(struct.calcsize('b'), 1) |
|
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
162 self.assertLessEqual(2, struct.calcsize('h')) |
|
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
163 self.assertLessEqual(4, struct.calcsize('l')) |
|
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
164 self.assertLessEqual(struct.calcsize('h'), struct.calcsize('i')) |
|
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
165 self.assertLessEqual(struct.calcsize('i'), struct.calcsize('l')) |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
166 if HAVE_LONG_LONG: |
|
60305
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
167 self.assertLessEqual(8, struct.calcsize('q')) |
|
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
168 self.assertLessEqual(struct.calcsize('l'), struct.calcsize('q')) |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
169 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
170 def test_integers(self): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
171 # Integer tests (bBhHiIlLqQ). |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
172 import binascii |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
173 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
174 class IntTester(unittest.TestCase): |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
175 def __init__(self, format): |
|
52827
c50c079b09eb
Merged revisions 70837,70864,70878,71004,71032,71043 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
52414
diff
changeset
|
176 super(IntTester, self).__init__(methodName='test_one') |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
177 self.format = format |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
178 self.code = format[-1] |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
179 self.byteorder = format[:-1] |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
180 if not self.byteorder in byteorders: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
181 raise ValueError("unrecognized packing byteorder: %s" % |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
182 self.byteorder) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
183 self.bytesize = struct.calcsize(format) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
184 self.bitsize = self.bytesize * 8 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
185 if self.code in tuple('bhilq'): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
186 self.signed = True |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
187 self.min_value = -(2**(self.bitsize-1)) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
188 self.max_value = 2**(self.bitsize-1) - 1 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
189 elif self.code in tuple('BHILQ'): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
190 self.signed = False |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
191 self.min_value = 0 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
192 self.max_value = 2**self.bitsize - 1 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
193 else: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
194 raise ValueError("unrecognized format code: %s" % |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
195 self.code) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
196 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
197 def test_one(self, x, pack=struct.pack, |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
198 unpack=struct.unpack, |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
199 unhexlify=binascii.unhexlify): |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
200 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
201 format = self.format |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
202 if self.min_value <= x <= self.max_value: |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
203 expected = x |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
204 if self.signed and x < 0: |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
205 expected += 1 << self.bitsize |
|
60305
58dc4f316ff6
Merged revisions 79740 via svnmerge from
Ezio Melotti <ezio.melotti@gmail.com>
parents:
60267
diff
changeset
|
206 self.assertGreaterEqual(expected, 0) |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
207 expected = '%x' % expected |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
208 if len(expected) & 1: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
209 expected = "0" + expected |
|
63244
f214ad09c384
Issue #4770: Restrict binascii module to accept only bytes (as specified).
Florent Xicluna <florent.xicluna@gmail.com>
parents:
62991
diff
changeset
|
210 expected = expected.encode('ascii') |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
211 expected = unhexlify(expected) |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
212 expected = (b"\x00" * (self.bytesize - len(expected)) + |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
213 expected) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
214 if (self.byteorder == '<' or |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
215 self.byteorder in ('', '@', '=') and not ISBIGENDIAN): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
216 expected = string_reverse(expected) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
217 self.assertEqual(len(expected), self.bytesize) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
218 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
219 # Pack work? |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
220 got = pack(format, x) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
221 self.assertEqual(got, expected) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
222 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
223 # Unpack work? |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
224 retrieved = unpack(format, got)[0] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
225 self.assertEqual(x, retrieved) |
|
18084
bbcdbd8f4469
Added q/Q standard (x-platform 8-byte ints) mode in struct module.
Tim Peters <tim.peters@gmail.com>
parents:
18070
diff
changeset
|
226 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
227 # Adding any byte should cause a "too big" error. |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
228 self.assertRaises((struct.error, TypeError), unpack, format, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
229 b'\x01' + got) |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
230 else: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
231 # x is out of range -- verify pack realizes that. |
|
62932
5e60c7db0f51
ValueError is eventually what we want to move to, I suppose
Benjamin Peterson <benjamin@python.org>
parents:
62896
diff
changeset
|
232 self.assertRaises((OverflowError, ValueError, struct.error), |
|
5e60c7db0f51
ValueError is eventually what we want to move to, I suppose
Benjamin Peterson <benjamin@python.org>
parents:
62896
diff
changeset
|
233 pack, format, x) |
|
19924
01f66f5db326
The 'p' (Pascal string) pack code acts unreasonably when the string size
Tim Peters <tim.peters@gmail.com>
parents:
18149
diff
changeset
|
234 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
235 def run(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
236 from random import randrange |
|
19924
01f66f5db326
The 'p' (Pascal string) pack code acts unreasonably when the string size
Tim Peters <tim.peters@gmail.com>
parents:
18149
diff
changeset
|
237 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
238 # Create all interesting powers of 2. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
239 values = [] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
240 for exp in range(self.bitsize + 3): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
241 values.append(1 << exp) |
|
19924
01f66f5db326
The 'p' (Pascal string) pack code acts unreasonably when the string size
Tim Peters <tim.peters@gmail.com>
parents:
18149
diff
changeset
|
242 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
243 # Add some random values. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
244 for i in range(self.bitsize): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
245 val = 0 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
246 for j in range(self.bytesize): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
247 val = (val << 8) | randrange(256) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
248 values.append(val) |
|
19924
01f66f5db326
The 'p' (Pascal string) pack code acts unreasonably when the string size
Tim Peters <tim.peters@gmail.com>
parents:
18149
diff
changeset
|
249 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
250 # Values absorbed from other tests |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
251 values.extend([300, 700000, sys.maxsize*4]) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
252 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
253 # Try all those, and their negations, and +-1 from |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
254 # them. Note that this tests all power-of-2 |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
255 # boundaries in range, and a few out of range, plus |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
256 # +-(2**n +- 1). |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
257 for base in values: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
258 for val in -base, base: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
259 for incr in -1, 0, 1: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
260 x = val + incr |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
261 self.test_one(x) |
|
28334
9f287e5eb037
SF bug 705836: struct.pack of floats in non-native endian order
Tim Peters <tim.peters@gmail.com>
parents:
28089
diff
changeset
|
262 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
263 # Some error cases. |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
264 class NotAnInt: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
265 def __int__(self): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
266 return 42 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
267 |
|
60309
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
268 # Objects with an '__index__' method should be allowed |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
269 # to pack as integers. That is assuming the implemented |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
270 # '__index__' method returns and 'int' or 'long'. |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
271 class Indexable(object): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
272 def __init__(self, value): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
273 self._value = value |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
274 |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
275 def __index__(self): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
276 return self._value |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
277 |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
278 # If the '__index__' method raises a type error, then |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
279 # '__int__' should be used with a deprecation warning. |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
280 class BadIndex(object): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
281 def __index__(self): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
282 raise TypeError |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
283 |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
284 def __int__(self): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
285 return 42 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
286 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
287 self.assertRaises((TypeError, struct.error), |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
288 struct.pack, self.format, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
289 "a string") |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
290 self.assertRaises((TypeError, struct.error), |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
291 struct.pack, self.format, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
292 randrange) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
293 self.assertRaises((TypeError, struct.error), |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
294 struct.pack, self.format, |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
295 3+42j) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
296 self.assertRaises((TypeError, struct.error), |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
297 struct.pack, self.format, |
|
60309
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
298 NotAnInt()) |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
299 self.assertRaises((TypeError, struct.error), |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
300 struct.pack, self.format, |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
301 BadIndex()) |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
302 |
|
60309
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
303 # Check for legitimate values from '__index__'. |
|
60267
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
304 for obj in (Indexable(0), Indexable(10), Indexable(17), |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
305 Indexable(42), Indexable(100), Indexable(127)): |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
306 try: |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
307 struct.pack(format, obj) |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
308 except: |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
309 self.fail("integer code pack failed on object " |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
310 "with '__index__' method") |
|
aa121a39a956
Merged revisions 79674 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60247
diff
changeset
|
311 |
|
60309
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
312 # Check for bogus values from '__index__'. |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
313 for obj in (Indexable(b'a'), Indexable('b'), Indexable(None), |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
314 Indexable({'a': 1}), Indexable([1, 2, 3])): |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
315 self.assertRaises((TypeError, struct.error), |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
316 struct.pack, self.format, |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
317 obj) |
|
72409b231967
Merged revisions 79745 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
60305
diff
changeset
|
318 |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
319 for code in integer_codes: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
320 for byteorder in byteorders: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
321 if (byteorder in ('', '@') and code in ('q', 'Q') and |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
322 not HAVE_LONG_LONG): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
323 continue |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
324 format = byteorder+code |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
325 t = IntTester(format) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
326 t.run() |
|
28334
9f287e5eb037
SF bug 705836: struct.pack of floats in non-native endian order
Tim Peters <tim.peters@gmail.com>
parents:
28089
diff
changeset
|
327 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
328 def test_p_code(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
329 # Test p ("Pascal string") code. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
330 for code, input, expected, expectedback in [ |
|
67181
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
331 ('p', b'abc', b'\x00', b''), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
332 ('1p', b'abc', b'\x00', b''), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
333 ('2p', b'abc', b'\x01a', b'a'), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
334 ('3p', b'abc', b'\x02ab', b'ab'), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
335 ('4p', b'abc', b'\x03abc', b'abc'), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
336 ('5p', b'abc', b'\x03abc\x00', b'abc'), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
337 ('6p', b'abc', b'\x03abc\x00\x00', b'abc'), |
|
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
338 ('1000p', b'x'*1000, b'\xff' + b'x'*999, b'x'*255)]: |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
339 got = struct.pack(code, input) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
340 self.assertEqual(got, expected) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
341 (got,) = struct.unpack(code, got) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
342 self.assertEqual(got, expectedback) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
343 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
344 def test_705836(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
345 # SF bug 705836. "<f" and ">f" had a severe rounding bug, where a carry |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
346 # from the low-order discarded bits could propagate into the exponent |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
347 # field, causing the result to be wrong by a factor of 2. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
348 import math |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
349 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
350 for base in range(1, 33): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
351 # smaller <- largest representable float less than base. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
352 delta = 0.5 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
353 while base - delta / 2.0 != base: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
354 delta /= 2.0 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
355 smaller = base - delta |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
356 # Packing this rounds away a solid string of trailing 1 bits. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
357 packed = struct.pack("<f", smaller) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
358 unpacked = struct.unpack("<f", packed)[0] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
359 # This failed at base = 2, 4, and 32, with unpacked = 1, 2, and |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
360 # 16, respectively. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
361 self.assertEqual(base, unpacked) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
362 bigpacked = struct.pack(">f", smaller) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
363 self.assertEqual(bigpacked, string_reverse(packed)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
364 unpacked = struct.unpack(">f", bigpacked)[0] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
365 self.assertEqual(base, unpacked) |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38673
diff
changeset
|
366 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
367 # Largest finite IEEE single. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
368 big = (1 << 24) - 1 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
369 big = math.ldexp(big, 127 - 23) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
370 packed = struct.pack(">f", big) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
371 unpacked = struct.unpack(">f", packed)[0] |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
372 self.assertEqual(big, unpacked) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
373 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
374 # The same, but tack on a 1 bit so it rounds up to infinity. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
375 big = (1 << 25) - 1 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
376 big = math.ldexp(big, 127 - 24) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
377 self.assertRaises(OverflowError, struct.pack, ">f", big) |
|
39442
654c380cf8b9
Merged revisions 46753-51188 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
38673
diff
changeset
|
378 |
|
53271
4527c152daa9
Issue #5463: Remove deprecated float coercion from struct module, along
Mark Dickinson <dickinsm@gmail.com>
parents:
52827
diff
changeset
|
379 def test_1530559(self): |
|
60247
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
380 for byteorder in '', '@', '=', '<', '>', '!': |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
381 for code in integer_codes: |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
382 if (byteorder in ('', '@') and code in ('q', 'Q') and |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
383 not HAVE_LONG_LONG): |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
384 continue |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
385 format = byteorder + code |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
386 self.assertRaises(struct.error, struct.pack, format, 1.0) |
|
bd5121bf6996
Clean up integer tests in test_struct, and bring them more in line with the trunk tests.
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
387 self.assertRaises(struct.error, struct.pack, format, 1.5) |
|
53271
4527c152daa9
Issue #5463: Remove deprecated float coercion from struct module, along
Mark Dickinson <dickinsm@gmail.com>
parents:
52827
diff
changeset
|
388 self.assertRaises(struct.error, struct.pack, 'P', 1.0) |
|
4527c152daa9
Issue #5463: Remove deprecated float coercion from struct module, along
Mark Dickinson <dickinsm@gmail.com>
parents:
52827
diff
changeset
|
389 self.assertRaises(struct.error, struct.pack, 'P', 1.5) |
|
4527c152daa9
Issue #5463: Remove deprecated float coercion from struct module, along
Mark Dickinson <dickinsm@gmail.com>
parents:
52827
diff
changeset
|
390 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
391 def test_unpack_from(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
392 test_string = b'abcd01234' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
393 fmt = '4s' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
394 s = struct.Struct(fmt) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
395 for cls in (bytes, bytearray): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
396 data = cls(test_string) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
397 self.assertEqual(s.unpack_from(data), (b'abcd',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
398 self.assertEqual(s.unpack_from(data, 2), (b'cd01',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
399 self.assertEqual(s.unpack_from(data, 4), (b'0123',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
400 for i in range(6): |
|
67181
b901da561cd1
Issue #10783: struct.pack() doesn't encode implicitly unicode to UTF-8
Victor Stinner <victor.stinner@haypocalc.com>
parents:
64355
diff
changeset
|
401 self.assertEqual(s.unpack_from(data, i), (data[i:i+4],)) |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
402 for i in range(6, len(test_string) + 1): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
403 self.assertRaises(struct.error, s.unpack_from, data, i) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
404 for cls in (bytes, bytearray): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
405 data = cls(test_string) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
406 self.assertEqual(struct.unpack_from(fmt, data), (b'abcd',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
407 self.assertEqual(struct.unpack_from(fmt, data, 2), (b'cd01',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
408 self.assertEqual(struct.unpack_from(fmt, data, 4), (b'0123',)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
409 for i in range(6): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
410 self.assertEqual(struct.unpack_from(fmt, data, i), (data[i:i+4],)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
411 for i in range(6, len(test_string) + 1): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
412 self.assertRaises(struct.error, struct.unpack_from, fmt, data, i) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
413 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
414 def test_pack_into(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
415 test_string = b'Reykjavik rocks, eow!' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
416 writable_buf = array.array('b', b' '*100) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
417 fmt = '21s' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
418 s = struct.Struct(fmt) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
419 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
420 # Test without offset |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
421 s.pack_into(writable_buf, 0, test_string) |
|
64355
fa8b57f987c5
Issue #8990: array.fromstring() and array.tostring() get renamed to
Antoine Pitrou <solipsis@pitrou.net>
parents:
63419
diff
changeset
|
422 from_buf = writable_buf.tobytes()[:len(test_string)] |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
423 self.assertEqual(from_buf, test_string) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
424 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
425 # Test with offset. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
426 s.pack_into(writable_buf, 10, test_string) |
|
64355
fa8b57f987c5
Issue #8990: array.fromstring() and array.tostring() get renamed to
Antoine Pitrou <solipsis@pitrou.net>
parents:
63419
diff
changeset
|
427 from_buf = writable_buf.tobytes()[:len(test_string)+10] |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
428 self.assertEqual(from_buf, test_string[:10] + test_string) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
429 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
430 # Go beyond boundaries. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
431 small_buf = array.array('b', b' '*10) |
|
62856
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
432 self.assertRaises((ValueError, struct.error), s.pack_into, small_buf, 0, |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
433 test_string) |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
434 self.assertRaises((ValueError, struct.error), s.pack_into, small_buf, 2, |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
435 test_string) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
436 |
|
51596
a83f10edb6ff
#3694: fix an "XXX undetected error" leak in struct.
Georg Brandl <georg@python.org>
parents:
51518
diff
changeset
|
437 # Test bogus offset (issue 3694) |
|
a83f10edb6ff
#3694: fix an "XXX undetected error" leak in struct.
Georg Brandl <georg@python.org>
parents:
51518
diff
changeset
|
438 sb = small_buf |
| 62896 | 439 self.assertRaises((TypeError, struct.error), struct.pack_into, b'', sb, |
| 440 None) | |
|
51596
a83f10edb6ff
#3694: fix an "XXX undetected error" leak in struct.
Georg Brandl <georg@python.org>
parents:
51518
diff
changeset
|
441 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
442 def test_pack_into_fn(self): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
443 test_string = b'Reykjavik rocks, eow!' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
444 writable_buf = array.array('b', b' '*100) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
445 fmt = '21s' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
446 pack_into = lambda *args: struct.pack_into(fmt, *args) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
447 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
448 # Test without offset. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
449 pack_into(writable_buf, 0, test_string) |
|
64355
fa8b57f987c5
Issue #8990: array.fromstring() and array.tostring() get renamed to
Antoine Pitrou <solipsis@pitrou.net>
parents:
63419
diff
changeset
|
450 from_buf = writable_buf.tobytes()[:len(test_string)] |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
451 self.assertEqual(from_buf, test_string) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
452 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
453 # Test with offset. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
454 pack_into(writable_buf, 10, test_string) |
|
64355
fa8b57f987c5
Issue #8990: array.fromstring() and array.tostring() get renamed to
Antoine Pitrou <solipsis@pitrou.net>
parents:
63419
diff
changeset
|
455 from_buf = writable_buf.tobytes()[:len(test_string)+10] |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
456 self.assertEqual(from_buf, test_string[:10] + test_string) |
|
38453
29ae5e0fc348
Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk.
Thomas Wouters <thomas@python.org>
parents:
33599
diff
changeset
|
457 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
458 # Go beyond boundaries. |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
459 small_buf = array.array('b', b' '*10) |
|
62856
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
460 self.assertRaises((ValueError, struct.error), pack_into, small_buf, 0, |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
461 test_string) |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
462 self.assertRaises((ValueError, struct.error), pack_into, small_buf, 2, |
|
8c6b3dc652fb
Merged revisions 82637 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62855
diff
changeset
|
463 test_string) |
|
38673
a19c20c5e5c7
Merge the rest of the trunk.
Thomas Wouters <thomas@python.org>
parents:
38669
diff
changeset
|
464 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
465 def test_unpack_with_buffer(self): |
|
68585
bf94b6a73fc8
#11565: Fix several typos. Patch by Piotr Kasprzyk.
Ezio Melotti <ezio.melotti@gmail.com>
parents:
62856
diff
changeset
|
466 # SF bug 1563759: struct.unpack doesn't support buffer protocol objects |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
467 data1 = array.array('B', b'\x12\x34\x56\x78') |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
468 data2 = memoryview(b'\x12\x34\x56\x78') # XXX b'......XXXX......', 6, 4 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
469 for data in [data1, data2]: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
470 value, = struct.unpack('>I', data) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
471 self.assertEqual(value, 0x12345678) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
472 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
473 def test_bool(self): |
|
62855
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
474 class ExplodingBool(object): |
|
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
475 def __bool__(self): |
|
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
476 raise IOError |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
477 for prefix in tuple("<>!=")+('',): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
478 false = (), [], [], '', 0 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
479 true = [1], 'test', 5, -1, 0xffffffff+1, 0xffffffff/2 |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
480 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
481 falseFormat = prefix + '?' * len(false) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
482 packedFalse = struct.pack(falseFormat, *false) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
483 unpackedFalse = struct.unpack(falseFormat, packedFalse) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
484 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
485 trueFormat = prefix + '?' * len(true) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
486 packedTrue = struct.pack(trueFormat, *true) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
487 unpackedTrue = struct.unpack(trueFormat, packedTrue) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
488 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
489 self.assertEqual(len(true), len(unpackedTrue)) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
490 self.assertEqual(len(false), len(unpackedFalse)) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
491 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
492 for t in unpackedFalse: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
493 self.assertFalse(t) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
494 for t in unpackedTrue: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
495 self.assertTrue(t) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
496 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
497 packed = struct.pack(prefix+'?', 1) |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
498 |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
499 self.assertEqual(len(packed), struct.calcsize(prefix+'?')) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
500 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
501 if len(packed) != 1: |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
502 self.assertFalse(prefix, msg='encoded bool is not one byte: %r' |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
503 %packed) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
504 |
|
62991
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
505 try: |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
506 struct.pack(prefix + '?', ExplodingBool()) |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
507 except IOError: |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
508 pass |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
509 else: |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
510 self.fail("Expected IOError: struct.pack(%r, " |
|
60fdf147032c
Yield more information on failure in test_struct boolean test.
Mark Dickinson <dickinsm@gmail.com>
parents:
62932
diff
changeset
|
511 "ExplodingBool())" % (prefix + '?')) |
|
62855
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
512 |
|
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
513 for c in [b'\x01', b'\x7f', b'\xff', b'\x0f', b'\xf0']: |
|
55a024f51524
Merged revisions 82628,82630 via svnmerge from
Benjamin Peterson <benjamin@python.org>
parents:
62251
diff
changeset
|
514 self.assertTrue(struct.unpack('>?', c)[0]) |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
40910
diff
changeset
|
515 |
|
62251
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
516 def test_count_overflow(self): |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
517 hugecount = '{}b'.format(sys.maxsize+1) |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
518 self.assertRaises(struct.error, struct.calcsize, hugecount) |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
519 |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
520 hugecount2 = '{}b{}H'.format(sys.maxsize//2, sys.maxsize//2) |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
521 self.assertRaises(struct.error, struct.calcsize, hugecount2) |
|
50c239174976
Merged revisions 81897-81898,81902 via svnmerge from
Mark Dickinson <dickinsm@gmail.com>
parents:
59366
diff
changeset
|
522 |
|
48321
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
523 if IS32BIT: |
|
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
524 def test_crasher(self): |
|
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
525 self.assertRaises(MemoryError, struct.pack, "357913941b", "a") |
|
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
526 |
|
62243
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
527 def test_trailing_counter(self): |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
528 store = array.array('b', b' '*100) |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
529 |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
530 # format lists containing only count spec should result in an error |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
531 self.assertRaises(struct.error, struct.pack, '12345') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
532 self.assertRaises(struct.error, struct.unpack, '12345', '') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
533 self.assertRaises(struct.error, struct.pack_into, '12345', store, 0) |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
534 self.assertRaises(struct.error, struct.unpack_from, '12345', store, 0) |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
535 |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
536 # Format lists with trailing count spec should result in an error |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
537 self.assertRaises(struct.error, struct.pack, 'c12345', 'x') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
538 self.assertRaises(struct.error, struct.unpack, 'c12345', 'x') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
539 self.assertRaises(struct.error, struct.pack_into, 'c12345', store, 0, |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
540 'x') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
541 self.assertRaises(struct.error, struct.unpack_from, 'c12345', store, |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
542 0) |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
543 |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
544 # Mixed format tests |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
545 self.assertRaises(struct.error, struct.pack, '14s42', 'spam and eggs') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
546 self.assertRaises(struct.error, struct.unpack, '14s42', |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
547 'spam and eggs') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
548 self.assertRaises(struct.error, struct.pack_into, '14s42', store, 0, |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
549 'spam and eggs') |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
550 self.assertRaises(struct.error, struct.unpack_from, '14s42', store, 0) |
|
3ba1b5b4c108
Issue #3129: Trailing digits in format string are no longer ignored.
Alexander Belopolsky <alexander.belopolsky@gmail.com>
parents:
60309
diff
changeset
|
551 |
|
63419
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
552 def test_Struct_reinitialization(self): |
|
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
553 # Issue 9422: there was a memory leak when reinitializing a |
|
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
554 # Struct instance. This test can be used to detect the leak |
|
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
555 # when running with regrtest -L. |
|
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
556 s = struct.Struct('i') |
|
1f0271c036e1
Add test for memory leak reported in issue 9422.
Mark Dickinson <dickinsm@gmail.com>
parents:
63244
diff
changeset
|
557 s.__init__('ii') |
|
48321
f6726f32ef70
Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47750
diff
changeset
|
558 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
559 def test_main(): |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
560 run_unittest(StructTest) |
|
40737
6ebad2a6b990
Merged revisions 53451-53537 via svnmerge from
Thomas Wouters <thomas@python.org>
parents:
40644
diff
changeset
|
561 |
|
47750
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
562 if __name__ == '__main__': |
|
f64996760984
Merged revisions 64089,64098,64100-64102,64113,64115-64116,64118,64120,64132,64342 via svnmerge from
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
47201
diff
changeset
|
563 test_main() |
