LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

make bencoding right for both py3+py2

Browse source
This commit is contained in:
Victor Shyba 2018-07-20 14:27:42 -03:00 committed by Jack Robison
parent ba80c0e594
commit 1ee682f06f
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lbrynet/dht/encoding.py
View file

@ -3,6 +3,9 @@ from .error import DecodeError
import sys import sys
if sys.version_info > (3,): if sys.version_info > (3,):
long = int long = int
raw = ord
else:
raw = lambda x: x
class Encoding(object): class Encoding(object):
""" Interface for RPC message encoders/decoders """ Interface for RPC message encoders/decoders
@ -86,7 +89,7 @@ class Bencode(Encoding):
@return: The decoded data, as a native Python type @return: The decoded data, as a native Python type
@rtype: int, list, dict or str @rtype: int, list, dict or str
""" """
assert type(data) == bytes assert type(data) == bytes # fixme: _maybe_ remove this after porting
if len(data) == 0: if len(data) == 0:
raise DecodeError('Cannot decode empty string') raise DecodeError('Cannot decode empty string')
try: try:
@ -100,34 +103,34 @@ class Bencode(Encoding):
Do not call this; use C{decode()} instead Do not call this; use C{decode()} instead
""" """
if data[startIndex] == ord('i'): if data[startIndex] == raw('i'):
endPos = data[startIndex:].find(b'e') + startIndex endPos = data[startIndex:].find(b'e') + startIndex
return int(data[startIndex + 1:endPos]), endPos + 1 return int(data[startIndex + 1:endPos]), endPos + 1
elif data[startIndex] == ord('l'): elif data[startIndex] == raw('l'):
startIndex += 1 startIndex += 1
decodedList = [] decodedList = []
while data[startIndex] != ord('e'): while data[startIndex] != raw('e'):
listData, startIndex = Bencode._decodeRecursive(data, startIndex) listData, startIndex = Bencode._decodeRecursive(data, startIndex)
decodedList.append(listData) decodedList.append(listData)
return decodedList, startIndex + 1 return decodedList, startIndex + 1
elif data[startIndex] == ord('d'): elif data[startIndex] == raw('d'):
startIndex += 1 startIndex += 1
decodedDict = {} decodedDict = {}
while data[startIndex] != ord('e'): while data[startIndex] != raw('e'):
key, startIndex = Bencode._decodeRecursive(data, startIndex) key, startIndex = Bencode._decodeRecursive(data, startIndex)
value, startIndex = Bencode._decodeRecursive(data, startIndex) value, startIndex = Bencode._decodeRecursive(data, startIndex)
decodedDict[key] = value decodedDict[key] = value
return decodedDict, startIndex return decodedDict, startIndex
elif data[startIndex] == ord('f'): elif data[startIndex] == raw('f'):
# This (float data type) is a non-standard extension to the original Bencode algorithm # This (float data type) is a non-standard extension to the original Bencode algorithm
endPos = data[startIndex:].find(ord('e')) + startIndex endPos = data[startIndex:].find(b'e') + startIndex
return float(data[startIndex + 1:endPos]), endPos + 1 return float(data[startIndex + 1:endPos]), endPos + 1
elif data[startIndex] == ord('n'): elif data[startIndex] == raw('n'):
# This (None/NULL data type) is a non-standard extension # This (None/NULL data type) is a non-standard extension
# to the original Bencode algorithm # to the original Bencode algorithm
return None, startIndex + 1 return None, startIndex + 1
else: else:
splitPos = data[startIndex:].find(ord(':')) + startIndex splitPos = data[startIndex:].find(b':') + startIndex
try: try:
length = int(data[startIndex:splitPos]) length = int(data[startIndex:splitPos])
except ValueError: except ValueError: