lunny/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware synced 2024-12-22 16:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream uf2conv.py changes (#23163)

Browse Source
This commit is contained in:
Joel Challis 2024-02-28 09:29:00 +00:00 committed by GitHub
parent b3462157dc
commit 51cfd7554a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/uf2conv.py
View File

@ -30,7 +30,7 @@ def is_hex(buf):
w = buf[0:30].decode("utf-8") w = buf[0:30].decode("utf-8")
except UnicodeDecodeError: except UnicodeDecodeError:
return False return False
if w[0] == ':' and re.match(b"^[:0-9a-fA-F\r\n]+$", buf): if w[0] == ':' and re.match(rb"^[:0-9a-fA-F\r\n]+$", buf):
return True return True
return False return False
@ -214,7 +214,7 @@ def get_drives():
"get", "DeviceID,", "VolumeName,", "get", "DeviceID,", "VolumeName,",
"FileSystem,", "DriveType"]) "FileSystem,", "DriveType"])
for line in to_str(r).split('\n'): for line in to_str(r).split('\n'):
words = re.split('\s+', line) words = re.split(r'\s+', line)
if len(words) >= 3 and words[1] == "2" and words[2] == "FAT": if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
drives.append(words[0]) drives.append(words[0])
else: else:
@ -243,7 +243,7 @@ def get_drives():
def board_id(path): def board_id(path):
with open(path + INFO_FILE, mode='r') as file: with open(path + INFO_FILE, mode='r') as file:
file_content = file.read() file_content = file.read()
return re.search("Board-ID: ([^\r\n]*)", file_content).group(1) return re.search(r"Board-ID: ([^\r\n]*)", file_content).group(1)
def list_drives(): def list_drives():