Skip to content

Commit 171bd4a

Browse files
committed
upgrade cython, remove benchmark in tests
1 parent dc41a2a commit 171bd4a

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

dev-requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
pytest==3.0.5
2-
pytest-benchmark==3.0.0
32
coverage==4.3.1
4-
cython==0.25.2
3+
cython==0.27.3
54
tox==2.5.0

tests/test_decode.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@ def test_decode2():
1616
assert length == 8
1717

1818

19-
def test_decode_str(benchmark):
20-
assert benchmark(bdecode, b'6:WWWWWW') == b"WWWWWW"
19+
def test_decode_str():
20+
assert bdecode(b'6:WWWWWW') == b"WWWWWW"
2121

2222

23-
def test_decode_int(benchmark):
24-
assert benchmark(bdecode, b'i233e') == 233
23+
def test_decode_int():
24+
assert bdecode(b'i233e') == 233
2525

2626

27-
def test_decode_large_int(benchmark):
27+
def test_decode_large_int():
2828
assert bdecode(b'i1455189890e') == 1455189890
2929
assert bdecode(b'i25735241490e') == 25735241490
3030

3131
MAX_SIZE = sys.maxsize + 1
3232
BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
33-
assert benchmark(bdecode, BENCODED_MAXSIZE) == MAX_SIZE
33+
assert bdecode(BENCODED_MAXSIZE) == MAX_SIZE
3434

3535

36-
def test_decode_list(benchmark):
37-
assert benchmark(bdecode, b'l1:a1:bi3ee') == [b'a', b'b', 3]
36+
def test_decode_list():
37+
assert bdecode(b'l1:a1:bi3ee') == [b'a', b'b', 3]
3838

3939

40-
def test_decode_dict(benchmark):
40+
def test_decode_dict():
4141
od = dict()
4242
od[b'ka'] = b'va'
4343
od[b'kb'] = 2
44-
assert benchmark(bdecode, b'd2:ka2:va2:kbi2ee') == od
44+
assert bdecode(b'd2:ka2:va2:kbi2ee') == od
4545

4646

47-
def test_ordered_dict(benchmark):
47+
def test_ordered_dict():
4848
from bencoder import OrderedDict
49-
rv = benchmark(bdecode, b'd2:ka2:va2:kbi2ee')
49+
rv = bdecode(b'd2:ka2:va2:kbi2ee')
5050
assert isinstance(rv, OrderedDict)
5151
assert list(rv.keys()) == [b'ka', b'kb']
5252
assert list(bdecode(b'd2:kc2:va2:kei2ee').keys()) == [b'kc', b'ke']

tests/test_encode.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,68 +10,68 @@
1010
)
1111

1212

13-
def test_encode_str(benchmark):
14-
assert benchmark(bencode, "WWWWWW") == b'6:WWWWWW'
13+
def test_encode_str():
14+
assert bencode("WWWWWW") == b'6:WWWWWW'
1515

1616

17-
def test_encode_int(benchmark):
18-
assert benchmark(bencode, 233) == b'i233e'
17+
def test_encode_int():
18+
assert bencode(233) == b'i233e'
1919

2020

21-
def test_encode_large_int(benchmark):
21+
def test_encode_large_int():
2222
assert bencode(1455189890) == b'i1455189890e'
2323
assert bencode(25735241490) == b'i25735241490e'
2424
MAX_SIZE = sys.maxsize + 1
2525
BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
2626

27-
assert benchmark(bencode, MAX_SIZE) == BENCODED_MAXSIZE
27+
assert bencode(MAX_SIZE) == BENCODED_MAXSIZE
2828

2929

30-
def test_encode_bytes(benchmark):
30+
def test_encode_bytes():
3131
b = b"TheseAreSomeBytes"
32-
coded = benchmark(bencode, b)
32+
coded = bencode(b)
3333
l = str(len(b)).encode()
3434
assert coded == l + b':' + b
3535

3636

37-
def test_encode_string(benchmark):
37+
def test_encode_string():
3838
b = "TheseAreSomeString"
39-
coded = benchmark(bencode, b)
39+
coded = bencode(b)
4040
l = str(len(b))
4141
assert coded == (l + ':' + b).encode()
4242

4343

44-
def test_encode_list(benchmark):
45-
assert benchmark(bencode, ['a', 'b', 3]) == b'l1:a1:bi3ee'
44+
def test_encode_list():
45+
assert bencode(['a', 'b', 3]) == b'l1:a1:bi3ee'
4646

4747

48-
def test_encode_tuple(benchmark):
49-
assert benchmark(bencode, ('a', 'b', 3)) == b'l1:a1:bi3ee'
48+
def test_encode_tuple():
49+
assert bencode(('a', 'b', 3)) == b'l1:a1:bi3ee'
5050

5151

52-
def test_encode_true(benchmark):
53-
assert benchmark(bencode, True) == bencode(1)
52+
def test_encode_true():
53+
assert bencode(True) == bencode(1)
5454

5555

56-
def test_encode_false(benchmark):
57-
assert benchmark(bencode, False) == bencode(0)
56+
def test_encode_false():
57+
assert bencode(False) == bencode(0)
5858

5959

60-
def test_encode_dict(benchmark):
60+
def test_encode_dict():
6161
od = dict()
6262
od['ka'] = 'va'
6363
od['kb'] = 2
64-
assert benchmark(bencode, od) == b'd2:ka2:va2:kbi2ee'
64+
assert bencode(od) == b'd2:ka2:va2:kbi2ee'
6565

6666

67-
def test_encode_dict_subclass(benchmark):
67+
def test_encode_dict_subclass():
6868
class AAA(dict):
6969
pass
7070

7171
od = AAA()
7272
od['ka'] = 'va'
7373
od['kb'] = 2
74-
assert benchmark(bencode, od) == b'd2:ka2:va2:kbi2ee'
74+
assert bencode(od) == b'd2:ka2:va2:kbi2ee'
7575

7676

7777
def test_encode_complex():

0 commit comments

Comments
 (0)