Skip to content

Commit

Permalink
Fix bytecode for Python 3.12
Browse files Browse the repository at this point in the history
`LOAD_ATTR` has been changed in Python 3.12 and it seems reusing the
`LOAD_GLOBAL` logic makes the simple tests passing.

I am not sure if this is correct since I'm pretty new to the code, but
maybe it's still helpful.
  • Loading branch information
felixonmars committed Apr 18, 2024
1 parent 2e017b8 commit 53a0d63
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion js2py/translators/translating_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ def TryStatement(type, block, handler, handlers, guardedHandlers, finalizer):
if handler:
identifier = handler['param']['name']
holder = 'PyJsHolder_%s_%d' % (to_hex(identifier),
random.randrange(1e8))
random.randrange(six.integer_types[-1](1e8)))
identifier = repr(identifier)
result += 'except PyJsException as PyJsTempException:\n'
# fill in except ( catch ) block and remember to recover holder variable to its previous state
Expand Down
4 changes: 3 additions & 1 deletion js2py/utils/injector.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# Opcode constants used for comparison and replacecment
LOAD_FAST = opcode.opmap['LOAD_FAST']
LOAD_GLOBAL = opcode.opmap['LOAD_GLOBAL']
LOAD_ATTR = opcode.opmap['LOAD_ATTR']
STORE_FAST = opcode.opmap['STORE_FAST']


Expand Down Expand Up @@ -79,6 +80,7 @@ def append_arguments(code_obj, new_locals):
(co_names.index(name), varnames.index(name)) for name in new_locals)

is_new_bytecode = sys.version_info >= (3, 11)
is_new_load_attr = sys.version_info >= (3, 12)
# Now we modify the actual bytecode
modified = []
drop_future_cache = False
Expand All @@ -97,7 +99,7 @@ def append_arguments(code_obj, new_locals):
# it's one of the globals that we are replacing. Either way,
# update its arg using the appropriate dict.
drop_future_cache = False
if inst.opcode == LOAD_GLOBAL:
if inst.opcode == LOAD_GLOBAL or is_new_load_attr and inst.opcode == LOAD_ATTR:
idx = inst.arg
if is_new_bytecode:
idx = idx // 2
Expand Down

0 comments on commit 53a0d63

Please sign in to comment.