mirror of
https://github.com/NinjaCheetah/libWiiPy.git
synced 2025-04-27 22:01:01 -04:00
Minor fix for accepting different input types for SharedContentMap.add_content()
This commit is contained in:
parent
76b773ee36
commit
a5ce7e9cd1
@ -569,7 +569,7 @@ class SharedContentMap:
|
|||||||
if type(content_hash) is bytes:
|
if type(content_hash) is bytes:
|
||||||
# This catches the format b'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG'
|
# This catches the format b'GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG'
|
||||||
if len(content_hash) == 40:
|
if len(content_hash) == 40:
|
||||||
pass
|
content_hash_converted = content_hash
|
||||||
# This catches the format
|
# This catches the format
|
||||||
# b'\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG'
|
# b'\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG\xGG'
|
||||||
elif len(content_hash) == 20:
|
elif len(content_hash) == 20:
|
||||||
@ -579,7 +579,7 @@ class SharedContentMap:
|
|||||||
raise ValueError("SHA-1 hash is not valid!")
|
raise ValueError("SHA-1 hash is not valid!")
|
||||||
# Allow for a string like "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG"
|
# Allow for a string like "GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG"
|
||||||
elif type(content_hash) is str:
|
elif type(content_hash) is str:
|
||||||
content_hash_converted = binascii.unhexlify(content_hash)
|
content_hash_converted = content_hash.encode()
|
||||||
# If the hash isn't bytes or a string, it isn't valid and is rejected.
|
# If the hash isn't bytes or a string, it isn't valid and is rejected.
|
||||||
else:
|
else:
|
||||||
raise TypeError("SHA-1 hash type is not valid! It must be either type str or bytes.")
|
raise TypeError("SHA-1 hash type is not valid! It must be either type str or bytes.")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user