djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpy-tool.py: Remove obsolete unicode flag in .mpy header.

Browse Source 
This was removed in c49d5207e9

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-05-26 11:43:46 +10:00
parent 4946dc5f8c
commit 1d047617bb
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/mpy-tool.py
View File

@ -1278,7 +1278,6 @@ def read_mpy(filename):
if header[1] != config.MPY_VERSION: if header[1] != config.MPY_VERSION:
raise MPYReadError(filename, "incompatible .mpy version") raise MPYReadError(filename, "incompatible .mpy version")
feature_byte = header[2] feature_byte = header[2]
config.MICROPY_PY_BUILTINS_STR_UNICODE = (feature_byte & 2) != 0
mpy_native_arch = feature_byte >> 2 mpy_native_arch = feature_byte >> 2
if mpy_native_arch != MP_NATIVE_ARCH_NONE: if mpy_native_arch != MP_NATIVE_ARCH_NONE:
if config.native_arch == MP_NATIVE_ARCH_NONE: if config.native_arch == MP_NATIVE_ARCH_NONE:
@ -1537,7 +1536,7 @@ def merge_mpy(raw_codes, output_file):
header = bytearray(4) header = bytearray(4)
header[0] = ord("M") header[0] = ord("M")
header[1] = config.MPY_VERSION header[1] = config.MPY_VERSION
header[2] = config.native_arch << 2 | config.MICROPY_PY_BUILTINS_STR_UNICODE << 1 header[2] = config.native_arch << 2
header[3] = config.mp_small_int_bits header[3] = config.mp_small_int_bits
merged_mpy.extend(header) merged_mpy.extend(header)