Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-45711: Re-bump the magic number and update doc (GH-29528)

This commit is contained in:
Brandt Bucher 2021-11-12 05:21:45 -08:00 committed by GitHub
parent e501d70b34
commit 8f1b71de73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Doc/library/dis.rst
View File

@ -873,10 +873,13 @@ All of the following opcodes use their arguments.
.. opcode:: JUMP_IF_NOT_EXC_MATCH (target) .. opcode:: JUMP_IF_NOT_EXC_MATCH (target)
Tests whether the second value on the stack is an exception matching TOS, Tests whether the second value on the stack is an exception matching TOS,
and jumps if it is not. Pops two values from the stack. and jumps if it is not. Pops one value from the stack.
.. versionadded:: 3.9 .. versionadded:: 3.9
.. versionchanged:: 3.11
This opcode no longer pops the active exception.
.. opcode:: JUMP_IF_TRUE_OR_POP (target) .. opcode:: JUMP_IF_TRUE_OR_POP (target)

2
Doc/whatsnew/3.11.rst
View File

@ -332,6 +332,8 @@ CPython bytecode changes
* Added :opcode:`COPY`, which pushes the *i*-th item to the top of the stack. * Added :opcode:`COPY`, which pushes the *i*-th item to the top of the stack.
The item is not removed from its original location. The item is not removed from its original location.
* :opcode:`JUMP_IF_NOT_EXC_MATCH` no longer pops the active exception.
Deprecated Deprecated
========== ==========

7
Lib/importlib/_bootstrap_external.py
View File

@ -366,7 +366,10 @@ _code_type = type(_write_atomic.__code__)
# Python 3.11a1 3461 (JUMP_ABSOLUTE must jump backwards) # Python 3.11a1 3461 (JUMP_ABSOLUTE must jump backwards)
# Python 3.11a2 3462 (bpo-44511: remove COPY_DICT_WITHOUT_KEYS, change # Python 3.11a2 3462 (bpo-44511: remove COPY_DICT_WITHOUT_KEYS, change
# MATCH_CLASS and MATCH_KEYS, and add COPY) # MATCH_CLASS and MATCH_KEYS, and add COPY)
# Python 3.11a3 3463 (Merge numeric BINARY_*/INPLACE_* into BINARY_OP) # Python 3.11a3 3463 (bpo-45711: JUMP_IF_NOT_EXC_MATCH no longer pops the
# active exception)
# Python 3.11a3 3464 (bpo-45636: Merge numeric BINARY_*/INPLACE_* into
# BINARY_OP)
# #
# MAGIC must change whenever the bytecode emitted by the compiler may no # MAGIC must change whenever the bytecode emitted by the compiler may no
@ -376,7 +379,7 @@ _code_type = type(_write_atomic.__code__)
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated. # in PC/launcher.c must also be updated.
MAGIC_NUMBER = (3463).to_bytes(2, 'little') + b'\r\n' MAGIC_NUMBER = (3464).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
_PYCACHE = '__pycache__' _PYCACHE = '__pycache__'