Remove encode_bool

Author: whtsky

bencoder.pyx

@@ -107,25 +107,20 @@ def encode(v, r):
     )
 
 
-def encode_int(x, list r):
+cdef encode_int(long x, list r):
     r.extend((b'i', str(x).encode(), b'e'))
 
 
-def encode_long(long x, list r):
+def encode_long(x, list r):
     r.extend((b'i', str(x).encode(), b'e'))
 
 
-def encode_bool(x, list r):
-    if x:
-        encode_int(1, r)
-    else:
-        encode_int(0, r)
+cdef encode_bytes(bytes x, list r):
+    r.extend((str(len(x)).encode(), b':', x))
 
 
-def encode_string(x, list r):
-    if isinstance(x, str):
-        x = x.encode()
-    r.extend((str(len(x)).encode(), b':', x))
+def encode_string(str x, list r):
+    r.extend((str(len(x)).encode(), b':', x.encode()))
 
 
 def encode_list(x, list r):
@@ -149,14 +144,14 @@ def encode_dict(x, list r):
 
 encode_func = {
     int: encode_int,
+    bool: encode_int,    
     long: encode_long,
-    bytes: encode_string,
+    bytes: encode_bytes,
     str: encode_string,
     list: encode_list,
     tuple: encode_list,
     dict: encode_dict,
     OrderedDict: encode_dict,
-    bool: encode_bool,
 }
 
 

tests/test_decode.py

@@ -21,7 +21,10 @@ def test_decode_int(benchmark):
 def test_decode_large_int(benchmark):
     assert bdecode(b'i1455189890e') == 1455189890
     assert bdecode(b'i25735241490e') == 25735241490
-    assert benchmark(bdecode, ('i%de' % sys.maxsize).encode()) == sys.maxsize
+
+    MAX_SIZE = sys.maxsize + 1
+    BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
+    assert benchmark(bdecode, BENCODED_MAXSIZE) == MAX_SIZE
 
 
 def test_decode_list(benchmark):

tests/test_encode.py

@@ -21,7 +21,10 @@ def test_encode_int(benchmark):
 def test_encode_large_int(benchmark):
     assert bencode(1455189890) == b'i1455189890e'
     assert bencode(25735241490) == b'i25735241490e'
-    assert benchmark(bencode, sys.maxsize) == ('i%de' % sys.maxsize).encode()
+    MAX_SIZE = sys.maxsize + 1
+    BENCODED_MAXSIZE = ('i%de' % MAX_SIZE).encode()
+
+    assert benchmark(bencode, MAX_SIZE) == BENCODED_MAXSIZE
 
 
 def test_encode_bytes(benchmark):
@@ -31,6 +34,13 @@ def test_encode_bytes(benchmark):
     assert coded == l + b':' + b
 
 
+def test_encode_string(benchmark):
+    b = "TheseAreSomeString"
+    coded = benchmark(bencode, b)
+    l = str(len(b))
+    assert coded == (l + ':' + b).encode()
+
+
 def test_encode_list(benchmark):
     assert benchmark(bencode, ['a', 'b', 3]) == b'l1:a1:bi3ee'