TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/mpremote: Use zlib.compressobj instead of zlib.compress.

Browse Source 
Because the `wbits` parameter was only added to `zlib.compress` in
CPython 3.11.  Using `zlib.compressobj` makes the code compatible with much
older CPython versions.

Fixes issue #17140.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-04-17 10:20:33 +10:00
parent 584fa8800b
commit dcca3ff602
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/mpremote/mpremote/commands.py
View File

@@ -649,7 +649,9 @@ def _do_romfs_deploy(state, args):
romfs_chunk += bytes(chunk_size - len(romfs_chunk)) romfs_chunk += bytes(chunk_size - len(romfs_chunk))
if has_deflate_io: if has_deflate_io:
# Needs: binascii.a2b_base64, io.BytesIO, deflate.DeflateIO. # Needs: binascii.a2b_base64, io.BytesIO, deflate.DeflateIO.
romfs_chunk_compressed = zlib.compress(romfs_chunk, wbits=-9) compressor = zlib.compressobj(wbits=-9)
romfs_chunk_compressed = compressor.compress(romfs_chunk)
romfs_chunk_compressed += compressor.flush()
buf = binascii.b2a_base64(romfs_chunk_compressed).strip() buf = binascii.b2a_base64(romfs_chunk_compressed).strip()
transport.exec(f"buf=DeflateIO(BytesIO(a2b_base64({buf})),RAW,9).read()") transport.exec(f"buf=DeflateIO(BytesIO(a2b_base64({buf})),RAW,9).read()")
elif has_a2b_base64: elif has_a2b_base64: