1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00

Merge pull request #13514 from benpicco/cc2538-bsl-fix

cc2538-bsl.py: fix ERROR: string argument without an encoding
This commit is contained in:
Kevin "Tristate Tom" Weiss 2020-03-04 09:53:13 +01:00 committed by GitHub
commit 21395f0396
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -140,7 +140,7 @@ class FirmwareFile(object):
firmware_is_hex = False
if have_magic:
file_type = bytearray(magic.from_file(path, True))
file_type = bytearray(magic.from_file(path, True), 'ascii')
# from_file() returns bytes with PY3, str with PY2. This comparison
# will be True in both cases"""