diff options
author | NoDRM <[email protected]> | 2023-08-03 20:14:33 +0200 |
---|---|---|
committer | NoDRM <[email protected]> | 2023-08-03 20:14:33 +0200 |
commit | d388ae72fd797efcef3da2b4ff8694cfaa4431cb (patch) | |
tree | 2a7b19c4c7ec5170494f32881bbfa3cbe38ed2c2 /DeDRM_plugin/kindlepid.py | |
parent | bc089ee46d3e5bbb458bc0dd7a503962495f9e2c (diff) |
More Py2 fixes
Diffstat (limited to 'DeDRM_plugin/kindlepid.py')
-rw-r--r-- | DeDRM_plugin/kindlepid.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/DeDRM_plugin/kindlepid.py b/DeDRM_plugin/kindlepid.py index 24e0fe8..a034e40 100644 --- a/DeDRM_plugin/kindlepid.py +++ b/DeDRM_plugin/kindlepid.py @@ -33,7 +33,7 @@ def checksumPid(s): for i in (0,1): b = crc & 0xff pos = (b // l) ^ (b % l) - res += letters[pos%l] + res += bytes(bytearray([letters[pos%l]])) crc >>= 8 return res @@ -43,16 +43,19 @@ def pidFromSerial(s, l): arr1 = [0]*l for i in range(len(s)): - arr1[i%l] ^= s[i] + if sys.version_info[0] == 2: + arr1[i%l] ^= ord(s[i]) + else: + arr1[i%l] ^= s[i] crc_bytes = [crc >> 24 & 0xff, crc >> 16 & 0xff, crc >> 8 & 0xff, crc & 0xff] for i in range(l): arr1[i] ^= crc_bytes[i&3] - pid = '' + pid = b"" for i in range(l): b = arr1[i] & 0xff - pid+=letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))] + pid+=bytes(bytearray([letters[(b >> 7) + ((b >> 5 & 3) ^ (b & 0x1f))]])) return pid |