Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | no longer in the source branch. |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~gz/brz/py3_bencode |
Merge into: | lp:brz |
Diff against target: |
396 lines (+127/-124) 2 files modified
breezy/tests/test__bencode.py (+91/-94) breezy/util/_bencode_py.py (+36/-30) |
To merge this branch: | bzr merge lp:~gz/brz/py3_bencode |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | Approve | ||
Review via email: mp+325451@code.launchpad.net |
Commit message
Make _bencode_py Python 3 compatible
Description of the change
It's b-time for b-encode.
Only real thing of note is the annoyance of turning int(4) into b'4' on Python 3. Also one change from [0] to [:1] so keys are always one char bytestrings not ints.
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'breezy/tests/test__bencode.py' |
2 | --- breezy/tests/test__bencode.py 2017-05-23 14:08:03 +0000 |
3 | +++ breezy/tests/test__bencode.py 2017-06-10 22:12:08 +0000 |
4 | @@ -38,73 +38,73 @@ |
5 | self.assertRaises(exc, self.module.bdecode, bad) |
6 | |
7 | def test_int(self): |
8 | - self._check(0, 'i0e') |
9 | - self._check(4, 'i4e') |
10 | - self._check(123456789, 'i123456789e') |
11 | - self._check(-10, 'i-10e') |
12 | - self._check(int('1' * 1000), 'i' + ('1' * 1000) + 'e') |
13 | + self._check(0, b'i0e') |
14 | + self._check(4, b'i4e') |
15 | + self._check(123456789, b'i123456789e') |
16 | + self._check(-10, b'i-10e') |
17 | + self._check(int('1' * 1000), b'i' + (b'1' * 1000) + b'e') |
18 | |
19 | def test_long(self): |
20 | - self._check(12345678901234567890, 'i12345678901234567890e') |
21 | - self._check(-12345678901234567890, 'i-12345678901234567890e') |
22 | + self._check(12345678901234567890, b'i12345678901234567890e') |
23 | + self._check(-12345678901234567890, b'i-12345678901234567890e') |
24 | |
25 | def test_malformed_int(self): |
26 | - self._run_check_error(ValueError, 'ie') |
27 | - self._run_check_error(ValueError, 'i-e') |
28 | - self._run_check_error(ValueError, 'i-010e') |
29 | - self._run_check_error(ValueError, 'i-0e') |
30 | - self._run_check_error(ValueError, 'i00e') |
31 | - self._run_check_error(ValueError, 'i01e') |
32 | - self._run_check_error(ValueError, 'i-03e') |
33 | - self._run_check_error(ValueError, 'i') |
34 | - self._run_check_error(ValueError, 'i123') |
35 | - self._run_check_error(ValueError, 'i341foo382e') |
36 | + self._run_check_error(ValueError, b'ie') |
37 | + self._run_check_error(ValueError, b'i-e') |
38 | + self._run_check_error(ValueError, b'i-010e') |
39 | + self._run_check_error(ValueError, b'i-0e') |
40 | + self._run_check_error(ValueError, b'i00e') |
41 | + self._run_check_error(ValueError, b'i01e') |
42 | + self._run_check_error(ValueError, b'i-03e') |
43 | + self._run_check_error(ValueError, b'i') |
44 | + self._run_check_error(ValueError, b'i123') |
45 | + self._run_check_error(ValueError, b'i341foo382e') |
46 | |
47 | def test_string(self): |
48 | - self._check('', '0:') |
49 | - self._check('abc', '3:abc') |
50 | - self._check('1234567890', '10:1234567890') |
51 | + self._check(b'', b'0:') |
52 | + self._check(b'abc', b'3:abc') |
53 | + self._check(b'1234567890', b'10:1234567890') |
54 | |
55 | def test_large_string(self): |
56 | - self.assertRaises(ValueError, self.module.bdecode, "2147483639:foo") |
57 | + self.assertRaises(ValueError, self.module.bdecode, b"2147483639:foo") |
58 | |
59 | def test_malformed_string(self): |
60 | - self._run_check_error(ValueError, '10:x') |
61 | - self._run_check_error(ValueError, '10:') |
62 | - self._run_check_error(ValueError, '10') |
63 | - self._run_check_error(ValueError, '01:x') |
64 | - self._run_check_error(ValueError, '00:') |
65 | - self._run_check_error(ValueError, '35208734823ljdahflajhdf') |
66 | - self._run_check_error(ValueError, '432432432432432:foo') |
67 | - self._run_check_error(ValueError, ' 1:x') # leading whitespace |
68 | - self._run_check_error(ValueError, '-1:x') # negative |
69 | - self._run_check_error(ValueError, '1 x') # space vs colon |
70 | - self._run_check_error(ValueError, '1x') # missing colon |
71 | - self._run_check_error(ValueError, ('1' * 1000) + ':') |
72 | + self._run_check_error(ValueError, b'10:x') |
73 | + self._run_check_error(ValueError, b'10:') |
74 | + self._run_check_error(ValueError, b'10') |
75 | + self._run_check_error(ValueError, b'01:x') |
76 | + self._run_check_error(ValueError, b'00:') |
77 | + self._run_check_error(ValueError, b'35208734823ljdahflajhdf') |
78 | + self._run_check_error(ValueError, b'432432432432432:foo') |
79 | + self._run_check_error(ValueError, b' 1:x') # leading whitespace |
80 | + self._run_check_error(ValueError, b'-1:x') # negative |
81 | + self._run_check_error(ValueError, b'1 x') # space vs colon |
82 | + self._run_check_error(ValueError, b'1x') # missing colon |
83 | + self._run_check_error(ValueError, (b'1' * 1000) + b':') |
84 | |
85 | def test_list(self): |
86 | - self._check([], 'le') |
87 | - self._check(['', '', ''], 'l0:0:0:e') |
88 | - self._check([1, 2, 3], 'li1ei2ei3ee') |
89 | - self._check(['asd', 'xy'], 'l3:asd2:xye') |
90 | - self._check([['Alice', 'Bob'], [2, 3]], 'll5:Alice3:Bobeli2ei3eee') |
91 | + self._check([], b'le') |
92 | + self._check([b'', b'', b''], b'l0:0:0:e') |
93 | + self._check([1, 2, 3], b'li1ei2ei3ee') |
94 | + self._check([b'asd', b'xy'], b'l3:asd2:xye') |
95 | + self._check([[b'Alice', b'Bob'], [2, 3]], b'll5:Alice3:Bobeli2ei3eee') |
96 | |
97 | def test_list_deepnested(self): |
98 | - self._run_check_error(RuntimeError, ("l" * 10000) + ("e" * 10000)) |
99 | + self._run_check_error(RuntimeError, (b"l" * 10000) + (b"e" * 10000)) |
100 | |
101 | def test_malformed_list(self): |
102 | - self._run_check_error(ValueError, 'l') |
103 | - self._run_check_error(ValueError, 'l01:ae') |
104 | - self._run_check_error(ValueError, 'l0:') |
105 | - self._run_check_error(ValueError, 'li1e') |
106 | - self._run_check_error(ValueError, 'l-3:e') |
107 | + self._run_check_error(ValueError, b'l') |
108 | + self._run_check_error(ValueError, b'l01:ae') |
109 | + self._run_check_error(ValueError, b'l0:') |
110 | + self._run_check_error(ValueError, b'li1e') |
111 | + self._run_check_error(ValueError, b'l-3:e') |
112 | |
113 | def test_dict(self): |
114 | - self._check({}, 'de') |
115 | - self._check({'':3}, 'd0:i3ee') |
116 | - self._check({'age': 25, 'eyes': 'blue'}, 'd3:agei25e4:eyes4:bluee') |
117 | - self._check({'spam.mp3': {'author': 'Alice', 'length': 100000}}, |
118 | - 'd8:spam.mp3d6:author5:Alice6:lengthi100000eee') |
119 | + self._check({}, b'de') |
120 | + self._check({b'':3}, b'd0:i3ee') |
121 | + self._check({b'age': 25, b'eyes': b'blue'}, b'd3:agei25e4:eyes4:bluee') |
122 | + self._check({b'spam.mp3': {b'author': b'Alice', b'length': 100000}}, |
123 | + b'd8:spam.mp3d6:author5:Alice6:lengthi100000eee') |
124 | |
125 | def test_dict_deepnested(self): |
126 | # The recursion here provokes CPython into emitting a warning on |
127 | @@ -114,30 +114,30 @@ |
128 | # avoid distracting noise in the test output. |
129 | self.overrideAttr(sys, 'stderr', self._log_file) |
130 | self._run_check_error( |
131 | - RuntimeError, ("d0:" * 10000) + 'i1e' + ("e" * 10000)) |
132 | + RuntimeError, (b"d0:" * 10000) + b'i1e' + (b"e" * 10000)) |
133 | |
134 | def test_malformed_dict(self): |
135 | - self._run_check_error(ValueError, 'd') |
136 | - self._run_check_error(ValueError, 'defoobar') |
137 | - self._run_check_error(ValueError, 'd3:fooe') |
138 | - self._run_check_error(ValueError, 'di1e0:e') |
139 | - self._run_check_error(ValueError, 'd1:b0:1:a0:e') |
140 | - self._run_check_error(ValueError, 'd1:a0:1:a0:e') |
141 | - self._run_check_error(ValueError, 'd0:0:') |
142 | - self._run_check_error(ValueError, 'd0:') |
143 | - self._run_check_error(ValueError, 'd432432432432432432:e') |
144 | + self._run_check_error(ValueError, b'd') |
145 | + self._run_check_error(ValueError, b'defoobar') |
146 | + self._run_check_error(ValueError, b'd3:fooe') |
147 | + self._run_check_error(ValueError, b'di1e0:e') |
148 | + self._run_check_error(ValueError, b'd1:b0:1:a0:e') |
149 | + self._run_check_error(ValueError, b'd1:a0:1:a0:e') |
150 | + self._run_check_error(ValueError, b'd0:0:') |
151 | + self._run_check_error(ValueError, b'd0:') |
152 | + self._run_check_error(ValueError, b'd432432432432432432:e') |
153 | |
154 | def test_empty_string(self): |
155 | - self.assertRaises(ValueError, self.module.bdecode, '') |
156 | + self.assertRaises(ValueError, self.module.bdecode, b'') |
157 | |
158 | def test_junk(self): |
159 | - self._run_check_error(ValueError, 'i6easd') |
160 | - self._run_check_error(ValueError, '2:abfdjslhfld') |
161 | - self._run_check_error(ValueError, '0:0:') |
162 | - self._run_check_error(ValueError, 'leanfdldjfh') |
163 | + self._run_check_error(ValueError, b'i6easd') |
164 | + self._run_check_error(ValueError, b'2:abfdjslhfld') |
165 | + self._run_check_error(ValueError, b'0:0:') |
166 | + self._run_check_error(ValueError, b'leanfdldjfh') |
167 | |
168 | def test_unknown_object(self): |
169 | - self.assertRaises(ValueError, self.module.bdecode, 'relwjhrlewjh') |
170 | + self.assertRaises(ValueError, self.module.bdecode, b'relwjhrlewjh') |
171 | |
172 | def test_unsupported_type(self): |
173 | self._run_check_error(TypeError, float(1.5)) |
174 | @@ -158,28 +158,28 @@ |
175 | self.assertEqual(expected, self.module.bencode(source)) |
176 | |
177 | def test_int(self): |
178 | - self._check('i4e', 4) |
179 | - self._check('i0e', 0) |
180 | - self._check('i-10e', -10) |
181 | + self._check(b'i4e', 4) |
182 | + self._check(b'i0e', 0) |
183 | + self._check(b'i-10e', -10) |
184 | |
185 | def test_long(self): |
186 | - self._check('i12345678901234567890e', 12345678901234567890) |
187 | - self._check('i-12345678901234567890e', -12345678901234567890) |
188 | + self._check(b'i12345678901234567890e', 12345678901234567890) |
189 | + self._check(b'i-12345678901234567890e', -12345678901234567890) |
190 | |
191 | def test_string(self): |
192 | - self._check('0:', '') |
193 | - self._check('3:abc', 'abc') |
194 | - self._check('10:1234567890', '1234567890') |
195 | + self._check(b'0:', b'') |
196 | + self._check(b'3:abc', b'abc') |
197 | + self._check(b'10:1234567890', b'1234567890') |
198 | |
199 | def test_list(self): |
200 | - self._check('le', []) |
201 | - self._check('li1ei2ei3ee', [1, 2, 3]) |
202 | - self._check('ll5:Alice3:Bobeli2ei3eee', [['Alice', 'Bob'], [2, 3]]) |
203 | + self._check(b'le', []) |
204 | + self._check(b'li1ei2ei3ee', [1, 2, 3]) |
205 | + self._check(b'll5:Alice3:Bobeli2ei3eee', [[b'Alice', b'Bob'], [2, 3]]) |
206 | |
207 | def test_list_as_tuple(self): |
208 | - self._check('le', ()) |
209 | - self._check('li1ei2ei3ee', (1, 2, 3)) |
210 | - self._check('ll5:Alice3:Bobeli2ei3eee', (('Alice', 'Bob'), (2, 3))) |
211 | + self._check(b'le', ()) |
212 | + self._check(b'li1ei2ei3ee', (1, 2, 3)) |
213 | + self._check(b'll5:Alice3:Bobeli2ei3eee', ((b'Alice', b'Bob'), (2, 3))) |
214 | |
215 | def test_list_deep_nested(self): |
216 | top = [] |
217 | @@ -187,31 +187,28 @@ |
218 | for i in range(10000): |
219 | l.append([]) |
220 | l = l[0] |
221 | - self.assertRaises(RuntimeError, self.module.bencode, |
222 | - top) |
223 | + self.assertRaises(RuntimeError, self.module.bencode, top) |
224 | |
225 | def test_dict(self): |
226 | - self._check('de', {}) |
227 | - self._check('d3:agei25e4:eyes4:bluee', {'age': 25, 'eyes': 'blue'}) |
228 | - self._check('d8:spam.mp3d6:author5:Alice6:lengthi100000eee', |
229 | - {'spam.mp3': {'author': 'Alice', |
230 | - 'length': 100000}}) |
231 | + self._check(b'de', {}) |
232 | + self._check(b'd3:agei25e4:eyes4:bluee', {b'age': 25, b'eyes': b'blue'}) |
233 | + self._check(b'd8:spam.mp3d6:author5:Alice6:lengthi100000eee', |
234 | + {b'spam.mp3': {b'author': b'Alice', b'length': 100000}}) |
235 | |
236 | def test_dict_deep_nested(self): |
237 | d = top = {} |
238 | for i in range(10000): |
239 | - d[''] = {} |
240 | - d = d[''] |
241 | - self.assertRaises(RuntimeError, self.module.bencode, |
242 | - top) |
243 | + d[b''] = {} |
244 | + d = d[b''] |
245 | + self.assertRaises(RuntimeError, self.module.bencode, top) |
246 | |
247 | def test_bencached(self): |
248 | - self._check('i3e', self.module.Bencached(self.module.bencode(3))) |
249 | + self._check(b'i3e', self.module.Bencached(self.module.bencode(3))) |
250 | |
251 | def test_invalid_dict(self): |
252 | - self.assertRaises(TypeError, self.module.bencode, {1:"foo"}) |
253 | + self.assertRaises(TypeError, self.module.bencode, {1: b"foo"}) |
254 | |
255 | def test_bool(self): |
256 | - self._check('i1e', True) |
257 | - self._check('i0e', False) |
258 | + self._check(b'i1e', True) |
259 | + self._check(b'i0e', False) |
260 | |
261 | |
262 | === modified file 'breezy/util/_bencode_py.py' |
263 | --- breezy/util/_bencode_py.py 2017-05-22 00:56:52 +0000 |
264 | +++ breezy/util/_bencode_py.py 2017-06-10 22:12:08 +0000 |
265 | @@ -30,43 +30,43 @@ |
266 | """ |
267 | self.yield_tuples = yield_tuples |
268 | decode_func = {} |
269 | - decode_func['l'] = self.decode_list |
270 | - decode_func['d'] = self.decode_dict |
271 | - decode_func['i'] = self.decode_int |
272 | - decode_func['0'] = self.decode_string |
273 | - decode_func['1'] = self.decode_string |
274 | - decode_func['2'] = self.decode_string |
275 | - decode_func['3'] = self.decode_string |
276 | - decode_func['4'] = self.decode_string |
277 | - decode_func['5'] = self.decode_string |
278 | - decode_func['6'] = self.decode_string |
279 | - decode_func['7'] = self.decode_string |
280 | - decode_func['8'] = self.decode_string |
281 | - decode_func['9'] = self.decode_string |
282 | + decode_func[b'l'] = self.decode_list |
283 | + decode_func[b'd'] = self.decode_dict |
284 | + decode_func[b'i'] = self.decode_int |
285 | + decode_func[b'0'] = self.decode_string |
286 | + decode_func[b'1'] = self.decode_string |
287 | + decode_func[b'2'] = self.decode_string |
288 | + decode_func[b'3'] = self.decode_string |
289 | + decode_func[b'4'] = self.decode_string |
290 | + decode_func[b'5'] = self.decode_string |
291 | + decode_func[b'6'] = self.decode_string |
292 | + decode_func[b'7'] = self.decode_string |
293 | + decode_func[b'8'] = self.decode_string |
294 | + decode_func[b'9'] = self.decode_string |
295 | self.decode_func = decode_func |
296 | |
297 | def decode_int(self, x, f): |
298 | f += 1 |
299 | - newf = x.index('e', f) |
300 | + newf = x.index(b'e', f) |
301 | n = int(x[f:newf]) |
302 | - if x[f] == '-': |
303 | - if x[f + 1] == '0': |
304 | + if x[f] == b'-': |
305 | + if x[f + 1] == b'0': |
306 | raise ValueError |
307 | - elif x[f] == '0' and newf != f+1: |
308 | + elif x[f] == b'0' and newf != f+1: |
309 | raise ValueError |
310 | return (n, newf+1) |
311 | |
312 | def decode_string(self, x, f): |
313 | - colon = x.index(':', f) |
314 | + colon = x.index(b':', f) |
315 | n = int(x[f:colon]) |
316 | - if x[f] == '0' and colon != f+1: |
317 | + if x[f] == b'0' and colon != f+1: |
318 | raise ValueError |
319 | colon += 1 |
320 | return (x[colon:colon+n], colon+n) |
321 | |
322 | def decode_list(self, x, f): |
323 | r, f = [], f+1 |
324 | - while x[f] != 'e': |
325 | + while x[f] != b'e': |
326 | v, f = self.decode_func[x[f]](x, f) |
327 | r.append(v) |
328 | if self.yield_tuples: |
329 | @@ -76,7 +76,7 @@ |
330 | def decode_dict(self, x, f): |
331 | r, f = {}, f+1 |
332 | lastkey = None |
333 | - while x[f] != 'e': |
334 | + while x[f] != b'e': |
335 | k, f = self.decode_string(x, f) |
336 | if lastkey >= k: |
337 | raise ValueError |
338 | @@ -88,7 +88,7 @@ |
339 | if not isinstance(x, bytes): |
340 | raise TypeError |
341 | try: |
342 | - r, l = self.decode_func[x[0]](x, 0) |
343 | + r, l = self.decode_func[x[:1]](x, 0) |
344 | except (IndexError, KeyError, OverflowError) as e: |
345 | raise ValueError(str(e)) |
346 | if l != len(x): |
347 | @@ -116,30 +116,36 @@ |
348 | encode_int(int(x), r) |
349 | |
350 | def encode_int(x, r): |
351 | - r.extend(('i', str(x), 'e')) |
352 | + r.extend((b'i', int_to_bytes(x), b'e')) |
353 | |
354 | def encode_string(x, r): |
355 | - r.extend((str(len(x)), ':', x)) |
356 | + r.extend((int_to_bytes(len(x)), b':', x)) |
357 | + |
358 | +def encode_unicode(x, r): |
359 | + r.extend((int_to_bytes(len(x)), b':', x)) |
360 | |
361 | def encode_list(x, r): |
362 | - r.append('l') |
363 | + r.append(b'l') |
364 | for i in x: |
365 | encode_func[type(i)](i, r) |
366 | - r.append('e') |
367 | + r.append(b'e') |
368 | |
369 | def encode_dict(x,r): |
370 | - r.append('d') |
371 | + r.append(b'd') |
372 | ilist = sorted(x.items()) |
373 | for k, v in ilist: |
374 | - r.extend((str(len(k)), ':', k)) |
375 | + r.extend((int_to_bytes(len(k)), b':', k)) |
376 | encode_func[type(v)](v, r) |
377 | - r.append('e') |
378 | + r.append(b'e') |
379 | |
380 | encode_func = {} |
381 | encode_func[type(Bencached(0))] = encode_bencached |
382 | encode_func[int] = encode_int |
383 | if sys.version_info < (3,): |
384 | encode_func[long] = encode_int |
385 | + int_to_bytes = str |
386 | +else: |
387 | + int_to_bytes = lambda n: b"%d" % n |
388 | encode_func[bytes] = encode_string |
389 | encode_func[list] = encode_list |
390 | encode_func[tuple] = encode_list |
391 | @@ -159,5 +165,5 @@ |
392 | def bencode(x): |
393 | r = [] |
394 | encode_func[type(x)](x, r) |
395 | - return ''.join(r) |
396 | + return b''.join(r) |
397 |