mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 11:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bpo-42246: Make sure that f_lasti, and thus f_lineno, is set correctly after raising or reraising an exception (GH-23803)

Browse Source 
* Ensure that f_lasti is set correctly after an exception is raised to conform to PEP 626.

* Update importlib

* Add NEWS.
This commit is contained in:
Mark Shannon 2020-12-17 13:55:28 +00:00 committed by GitHub
parent 40125ab325
commit bf353f3c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 317 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/dis.rst
View File

@ -708,7 +708,8 @@ iterations of the loop.
.. opcode:: RERAISE
Re-raises the exception currently on top of the stack.
Re-raises the exception currently on top of the stack. If oparg is non-zero,
restores ``f_lasti`` of the current frame to its value when the exception was raised.
.. versionadded:: 3.9

2
Include/opcode.h generated
View File

@ -30,7 +30,6 @@ extern "C" {
#define BINARY_TRUE_DIVIDE 27
#define INPLACE_FLOOR_DIVIDE 28
#define INPLACE_TRUE_DIVIDE 29
#define RERAISE 48
#define WITH_EXCEPT_START 49
#define GET_AITER 50
#define GET_ANEXT 51
@ -96,6 +95,7 @@ extern "C" {
#define LOAD_GLOBAL 116
#define IS_OP 117
#define CONTAINS_OP 118
#define RERAISE 119
#define JUMP_IF_NOT_EXC_MATCH 121
#define SETUP_FINALLY 122
#define LOAD_FAST 124

3
Lib/importlib/_bootstrap_external.py
View File

@ -312,6 +312,7 @@ _code_type = type(_write_atomic.__code__)
# Python 3.10a1 3430 (Make 'annotations' future by default)
# Python 3.10a1 3431 (New line number table format -- PEP 626)
# Python 3.10a2 3432 (Function annotation for MAKE_FUNCTION is changed from dict to tuple bpo-42202)
# Python 3.10a2 3433 (RERAISE restores f_lasti if oparg != 0)
#
# MAGIC must change whenever the bytecode emitted by the compiler may no
@ -321,7 +322,7 @@ _code_type = type(_write_atomic.__code__)
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
MAGIC_NUMBER = (3432).to_bytes(2, 'little') + b'\r\n'
MAGIC_NUMBER = (3433).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
_PYCACHE = '__pycache__'

2
Lib/opcode.py
View File

@ -83,7 +83,6 @@ def_op('BINARY_TRUE_DIVIDE', 27)
def_op('INPLACE_FLOOR_DIVIDE', 28)
def_op('INPLACE_TRUE_DIVIDE', 29)
def_op('RERAISE', 48)
def_op('WITH_EXCEPT_START', 49)
def_op('GET_AITER', 50)
def_op('GET_ANEXT', 51)
@ -161,6 +160,7 @@ name_op('LOAD_GLOBAL', 116) # Index in name list
def_op('IS_OP', 117)
def_op('CONTAINS_OP', 118)
def_op('RERAISE', 119)
jabs_op('JUMP_IF_NOT_EXC_MATCH', 121)
jrel_op('SETUP_FINALLY', 122) # Distance to target address

14
Lib/test/test_dis.py
View File

@ -313,9 +313,9 @@ dis_traceback = """\
>> 50 LOAD_CONST 0 (None)
52 STORE_FAST 0 (e)
54 DELETE_FAST 0 (e)
56 RERAISE
56 RERAISE 1
%3d >> 58 RERAISE
%3d >> 58 RERAISE 0
""" % (TRACEBACK_CODE.co_firstlineno + 1,
TRACEBACK_CODE.co_firstlineno + 2,
TRACEBACK_CODE.co_firstlineno + 5,
@ -370,7 +370,7 @@ dis_tryfinally = """\
>> 14 LOAD_FAST 1 (b)
16 CALL_FUNCTION 0
18 POP_TOP
20 RERAISE
20 RERAISE 0
""" % (_tryfinally.__code__.co_firstlineno + 1,
_tryfinally.__code__.co_firstlineno + 2,
_tryfinally.__code__.co_firstlineno + 4,
@ -389,7 +389,7 @@ dis_tryfinallyconst = """\
>> 14 LOAD_FAST 0 (b)
16 CALL_FUNCTION 0
18 POP_TOP
20 RERAISE
20 RERAISE 0
""" % (_tryfinallyconst.__code__.co_firstlineno + 1,
_tryfinallyconst.__code__.co_firstlineno + 2,
_tryfinallyconst.__code__.co_firstlineno + 4,
@ -1076,7 +1076,7 @@ expected_opinfo_jumpy = [
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=136, starts_line=None, is_jump_target=False),
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=138, starts_line=None, is_jump_target=False),
Instruction(opname='JUMP_FORWARD', opcode=110, arg=46, argval=188, argrepr='to 188', offset=140, starts_line=None, is_jump_target=False),
Instruction(opname='RERAISE', opcode=48, arg=None, argval=None, argrepr='', offset=142, starts_line=None, is_jump_target=True),
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=142, starts_line=None, is_jump_target=True),
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=25, is_jump_target=True),
Instruction(opname='SETUP_WITH', opcode=143, arg=24, argval=172, argrepr='to 172', offset=146, starts_line=None, is_jump_target=False),
Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=148, starts_line=None, is_jump_target=False),
@ -1093,7 +1093,7 @@ expected_opinfo_jumpy = [
Instruction(opname='JUMP_FORWARD', opcode=110, arg=16, argval=188, argrepr='to 188', offset=170, starts_line=None, is_jump_target=False),
Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=True),
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=178, argval=178, argrepr='', offset=174, starts_line=None, is_jump_target=False),
Instruction(opname='RERAISE', opcode=48, arg=None, argval=None, argrepr='', offset=176, starts_line=None, is_jump_target=False),
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=176, starts_line=None, is_jump_target=False),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=178, starts_line=None, is_jump_target=True),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=False),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False),
@ -1110,7 +1110,7 @@ expected_opinfo_jumpy = [
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=204, starts_line=None, is_jump_target=False),
Instruction(opname='CALL_FUNCTION', opcode=131, arg=1, argval=1, argrepr='', offset=206, starts_line=None, is_jump_target=False),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=208, starts_line=None, is_jump_target=False),
Instruction(opname='RERAISE', opcode=48, arg=None, argval=None, argrepr='', offset=210, starts_line=None, is_jump_target=False),
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=210, starts_line=None, is_jump_target=False),
]
# One last piece of inspect fodder to check the default line number handling

83
Lib/test/test_exceptions.py
View File

@ -1488,5 +1488,88 @@ class ImportErrorTests(unittest.TestCase):
self.assertEqual(exc.path, orig.path)
class PEP626Tests(unittest.TestCase):
def lineno_after_raise(self, f, line):
try:
f()
except Exception as ex:
t = ex.__traceback__
while t.tb_next:
t = t.tb_next
frame = t.tb_frame
self.assertEqual(frame.f_lineno-frame.f_code.co_firstlineno, line)
def test_lineno_after_raise_simple(self):
def simple():
1/0
pass
self.lineno_after_raise(simple, 1)
def test_lineno_after_raise_in_except(self):
def in_except():
try:
1/0
except:
1/0
pass
self.lineno_after_raise(in_except, 4)
def test_lineno_after_other_except(self):
def other_except():
try:
1/0
except TypeError as ex:
pass
self.lineno_after_raise(other_except, 3)
def test_lineno_in_named_except(self):
def in_named_except():
try:
1/0
except Exception as ex:
1/0
pass
self.lineno_after_raise(in_named_except, 4)
def test_lineno_in_try(self):
def in_try():
try:
1/0
finally:
pass
self.lineno_after_raise(in_try, 4)
def test_lineno_in_finally_normal(self):
def in_finally_normal():
try:
pass
finally:
1/0
pass
self.lineno_after_raise(in_finally_normal, 4)
def test_lineno_in_finally_except(self):
def in_finally_except():
try:
1/0
finally:
1/0
pass
self.lineno_after_raise(in_finally_except, 4)
def test_lineno_after_with(self):
class Noop:
def __enter__(self):
return self
def __exit__(self, *args):
pass
def after_with():
with Noop():
1/0
pass
self.lineno_after_raise(after_with, 2)
if __name__ == '__main__':
unittest.main()

3
Misc/NEWS.d/next/Core and Builtins/2020-12-16-14-44-21.bpo-42246.RtIEY7.rst Normal file
View File

@ -0,0 +1,3 @@
Make sure that the ``f_lasti`` and ``f_lineno`` attributes of a frame are
set correctly when an exception is raised or re-raised. Required for PEP
626.

6
Python/ceval.c
View File

@ -2430,6 +2430,10 @@ main_loop:
}
case TARGET(RERAISE): {
assert(f->f_iblock > 0);
if (oparg) {
f->f_lasti = f->f_blockstack[f->f_iblock-1].b_handler;
}
PyObject *exc = POP();
PyObject *val = POP();
PyObject *tb = POP();
@ -4039,7 +4043,7 @@ exception_unwind:
int handler = b->b_handler;
_PyErr_StackItem *exc_info = tstate->exc_info;
/* Beware, this invalidates all b->b_* fields */
PyFrame_BlockSetup(f, EXCEPT_HANDLER, -1, STACK_LEVEL());
PyFrame_BlockSetup(f, EXCEPT_HANDLER, f->f_lasti, STACK_LEVEL());
PUSH(exc_info->exc_traceback);
PUSH(exc_info->exc_value);
if (exc_info->exc_type != NULL) {

8
Python/compile.c
View File

@ -2981,7 +2981,7 @@ compiler_try_finally(struct compiler *c, stmt_ty s)
return 0;
VISIT_SEQ(c, stmt, s->v.Try.finalbody);
compiler_pop_fblock(c, FINALLY_END, end);
ADDOP(c, RERAISE);
ADDOP_I(c, RERAISE, 0);
compiler_use_next_block(c, exit);
return 1;
}
@ -3107,7 +3107,7 @@ compiler_try_except(struct compiler *c, stmt_ty s)
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
compiler_nameop(c, handler->v.ExceptHandler.name, Del);
ADDOP(c, RERAISE);
ADDOP_I(c, RERAISE, 1);
}
else {
basicblock *cleanup_body;
@ -3129,7 +3129,7 @@ compiler_try_except(struct compiler *c, stmt_ty s)
compiler_use_next_block(c, except);
}
compiler_pop_fblock(c, EXCEPTION_HANDLER, NULL);
ADDOP(c, RERAISE);
ADDOP_I(c, RERAISE, 0);
compiler_use_next_block(c, orelse);
VISIT_SEQ(c, stmt, s->v.Try.orelse);
compiler_use_next_block(c, end);
@ -4759,7 +4759,7 @@ compiler_with_except_finish(struct compiler *c) {
return 0;
ADDOP_JUMP(c, POP_JUMP_IF_TRUE, exit);
NEXT_BLOCK(c);
ADDOP(c, RERAISE);
ADDOP_I(c, RERAISE, 1);
compiler_use_next_block(c, exit);
ADDOP(c, POP_TOP);
ADDOP(c, POP_TOP);

86
Python/importlib.h generated
View File

@ -57,7 +57,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,0,0,67,0,0,0,115,38,0,0,0,122,8,124,0,
106,0,87,0,83,0,4,0,116,1,121,36,1,0,1,0,
1,0,116,2,124,0,131,1,106,0,6,0,89,0,83,0,
48,0,169,1,78,41,3,218,12,95,95,113,117,97,108,110,
119,0,169,1,78,41,3,218,12,95,95,113,117,97,108,110,
97,109,101,95,95,218,14,65,116,116,114,105,98,117,116,101,
69,114,114,111,114,218,4,116,121,112,101,41,1,218,3,111,
98,106,169,0,114,5,0,0,0,250,29,60,102,114,111,122,
@ -159,10 +159,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
161,0,114,112,116,7,100,5,124,0,22,0,131,1,130,1,
124,0,106,8,160,9,100,6,161,1,114,138,124,0,4,0,
106,10,100,3,55,0,2,0,95,10,87,0,100,4,4,0,
4,0,131,3,1,0,110,16,49,0,115,158,48,0,1,0,
4,0,131,3,1,0,110,16,49,0,115,158,119,1,1,0,
1,0,1,0,89,0,1,0,124,0,106,8,160,9,161,0,
1,0,124,0,106,8,160,11,161,0,1,0,113,20,116,2,
124,1,61,0,48,0,41,7,122,185,10,32,32,32,32,32,
124,1,61,0,119,0,41,7,122,185,10,32,32,32,32,32,
32,32,32,65,99,113,117,105,114,101,32,116,104,101,32,109,
111,100,117,108,101,32,108,111,99,107,46,32,32,73,102,32,
97,32,112,111,116,101,110,116,105,97,108,32,100,101,97,100,
@ -197,7 +197,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,106,6,114,108,124,0,4,0,106,6,100,3,56,0,2,
0,95,6,124,0,106,7,160,8,161,0,1,0,87,0,100,
0,4,0,4,0,131,3,1,0,100,0,83,0,49,0,115,
130,48,0,1,0,1,0,1,0,89,0,1,0,100,0,83,
130,119,1,1,0,1,0,1,0,89,0,1,0,100,0,83,
0,41,4,78,250,31,99,97,110,110,111,116,32,114,101,108,
101,97,115,101,32,117,110,45,97,99,113,117,105,114,101,100,
32,108,111,99,107,114,25,0,0,0,114,42,0,0,0,41,
@ -323,12 +323,12 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
67,0,0,0,115,134,0,0,0,116,0,160,1,161,0,1,
0,122,114,122,14,116,2,124,0,25,0,131,0,125,1,87,
0,110,22,4,0,116,3,121,46,1,0,1,0,1,0,100,
1,125,1,89,0,110,2,48,0,124,1,100,1,117,0,114,
1,125,1,89,0,110,2,119,0,124,1,100,1,117,0,114,
110,116,4,100,1,117,0,114,74,116,5,124,0,131,1,125,
1,110,8,116,6,124,0,131,1,125,1,124,0,102,1,100,
2,100,3,132,1,125,2,116,7,160,8,124,1,124,2,161,
2,116,2,124,0,60,0,87,0,116,0,160,9,161,0,1,
0,124,1,83,0,116,0,160,9,161,0,1,0,48,0,41,
0,124,1,83,0,116,0,160,9,161,0,1,0,119,0,41,
4,122,139,71,101,116,32,111,114,32,99,114,101,97,116,101,
32,116,104,101,32,109,111,100,117,108,101,32,108,111,99,107,
32,102,111,114,32,97,32,103,105,118,101,110,32,109,111,100,
@ -343,7 +343,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
1,161,0,1,0,122,34,116,2,160,3,124,1,161,1,124,
0,117,0,114,30,116,2,124,1,61,0,87,0,116,0,160,
4,161,0,1,0,100,0,83,0,116,0,160,4,161,0,1,
0,48,0,114,0,0,0,0,41,5,218,4,95,105,109,112,
0,119,0,114,0,0,0,0,41,5,218,4,95,105,109,112,
218,12,97,99,113,117,105,114,101,95,108,111,99,107,218,13,
95,109,111,100,117,108,101,95,108,111,99,107,115,114,38,0,
0,0,218,12,114,101,108,101,97,115,101,95,108,111,99,107,
@ -365,7 +365,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,0,0,0,2,0,0,0,8,0,0,0,67,0,0,0,
115,54,0,0,0,116,0,124,0,131,1,125,1,122,12,124,
1,160,1,161,0,1,0,87,0,110,20,4,0,116,2,121,
40,1,0,1,0,1,0,89,0,100,1,83,0,48,0,124,
40,1,0,1,0,1,0,89,0,100,1,83,0,119,0,124,
1,160,3,161,0,1,0,100,1,83,0,41,2,122,189,65,
99,113,117,105,114,101,115,32,116,104,101,110,32,114,101,108,
101,97,115,101,115,32,116,104,101,32,109,111,100,117,108,101,
@ -527,16 +527,16 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
210,0,0,0,116,0,124,0,100,1,100,0,131,3,125,1,
116,1,124,1,100,2,131,2,114,54,122,12,124,1,160,2,
124,0,161,1,87,0,83,0,4,0,116,3,121,52,1,0,
1,0,1,0,89,0,110,2,48,0,122,10,124,0,106,4,
1,0,1,0,89,0,110,2,119,0,122,10,124,0,106,4,
125,2,87,0,110,18,4,0,116,5,121,82,1,0,1,0,
1,0,89,0,110,18,48,0,124,2,100,0,117,1,114,100,
1,0,89,0,110,18,119,0,124,2,100,0,117,1,114,100,
116,6,124,2,131,1,83,0,122,10,124,0,106,7,125,3,
87,0,110,22,4,0,116,5,121,132,1,0,1,0,1,0,
100,3,125,3,89,0,110,2,48,0,122,10,124,0,106,8,
100,3,125,3,89,0,110,2,119,0,122,10,124,0,106,8,
125,4,87,0,110,52,4,0,116,5,121,196,1,0,1,0,
1,0,124,1,100,0,117,0,114,180,100,4,160,9,124,3,
161,1,6,0,89,0,83,0,100,5,160,9,124,3,124,1,
161,2,6,0,89,0,83,0,48,0,100,6,160,9,124,3,
161,2,6,0,89,0,83,0,119,0,100,6,160,9,124,3,
124,4,161,2,83,0,41,7,78,218,10,95,95,108,111,97,
100,101,114,95,95,218,11,109,111,100,117,108,101,95,114,101,
112,114,250,1,63,250,13,60,109,111,100,117,108,101,32,123,
@ -708,7 +708,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
111,76,124,2,124,1,106,0,107,2,111,76,124,0,106,4,
124,1,106,4,107,2,111,76,124,0,106,5,124,1,106,5,
107,2,87,0,83,0,4,0,116,6,121,100,1,0,1,0,
1,0,116,7,6,0,89,0,83,0,48,0,114,0,0,0,
1,0,116,7,6,0,89,0,83,0,119,0,114,0,0,0,
0,41,8,114,123,0,0,0,114,20,0,0,0,114,116,0,
0,0,114,120,0,0,0,218,6,99,97,99,104,101,100,218,
12,104,97,115,95,108,111,99,97,116,105,111,110,114,2,0,
@ -785,7 +785,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
100,4,141,3,83,0,124,3,100,2,117,0,114,134,116,0,
124,1,100,5,131,2,114,130,122,14,124,1,160,4,124,0,
161,1,125,3,87,0,110,26,4,0,116,5,121,128,1,0,
1,0,1,0,100,2,125,3,89,0,110,6,48,0,100,6,
1,0,1,0,100,2,125,3,89,0,110,6,119,0,100,6,
125,3,116,6,124,0,124,1,124,2,124,3,100,7,141,4,
83,0,41,8,122,53,82,101,116,117,114,110,32,97,32,109,
111,100,117,108,101,32,115,112,101,99,32,98,97,115,101,100,
@ -807,20 +807,20 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,0,0,0,0,0,0,0,0,8,0,0,0,8,0,0,
0,67,0,0,0,115,40,1,0,0,122,10,124,0,106,0,
125,3,87,0,110,18,4,0,116,1,121,28,1,0,1,0,
1,0,89,0,110,14,48,0,124,3,100,0,117,1,114,42,
1,0,89,0,110,14,119,0,124,3,100,0,117,1,114,42,
124,3,83,0,124,0,106,2,125,4,124,1,100,0,117,0,
114,86,122,10,124,0,106,3,125,1,87,0,110,18,4,0,
116,1,121,84,1,0,1,0,1,0,89,0,110,2,48,0,
116,1,121,84,1,0,1,0,1,0,89,0,110,2,119,0,
122,10,124,0,106,4,125,5,87,0,110,22,4,0,116,1,
121,118,1,0,1,0,1,0,100,0,125,5,89,0,110,2,
48,0,124,2,100,0,117,0,114,174,124,5,100,0,117,0,
119,0,124,2,100,0,117,0,114,174,124,5,100,0,117,0,
114,170,122,10,124,1,106,5,125,2,87,0,110,26,4,0,
116,1,121,168,1,0,1,0,1,0,100,0,125,2,89,0,
110,6,48,0,124,5,125,2,122,10,124,0,106,6,125,6,
110,6,119,0,124,5,125,2,122,10,124,0,106,6,125,6,
87,0,110,22,4,0,116,1,121,206,1,0,1,0,1,0,
100,0,125,6,89,0,110,2,48,0,122,14,116,7,124,0,
100,0,125,6,89,0,110,2,119,0,122,14,116,7,124,0,
106,8,131,1,125,7,87,0,110,22,4,0,116,1,121,244,
1,0,1,0,1,0,100,0,125,7,89,0,110,2,48,0,
1,0,1,0,1,0,100,0,125,7,89,0,110,2,119,0,
116,9,124,4,124,1,124,2,100,1,141,3,125,3,124,5,
100,0,117,0,144,1,114,18,100,2,110,2,100,3,124,3,
95,10,124,6,124,3,95,11,124,7,124,3,95,12,124,3,
@ -846,7 +846,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,115,214,1,0,0,124,2,115,20,116,0,124,1,100,1,
100,0,131,3,100,0,117,0,114,52,122,12,124,0,106,1,
124,1,95,2,87,0,110,18,4,0,116,3,121,50,1,0,
1,0,1,0,89,0,110,2,48,0,124,2,115,72,116,0,
1,0,1,0,89,0,110,2,119,0,124,2,115,72,116,0,
124,1,100,2,100,0,131,3,100,0,117,0,114,174,124,0,
106,4,125,3,124,3,100,0,117,0,114,144,124,0,106,5,
100,0,117,1,114,144,116,6,100,0,117,0,114,108,116,7,
@ -854,25 +854,25 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
125,3,124,0,106,5,124,3,95,10,124,3,124,0,95,4,
100,0,124,1,95,11,122,10,124,3,124,1,95,12,87,0,
110,18,4,0,116,3,121,172,1,0,1,0,1,0,89,0,
110,2,48,0,124,2,115,194,116,0,124,1,100,3,100,0,
110,2,119,0,124,2,115,194,116,0,124,1,100,3,100,0,
131,3,100,0,117,0,114,226,122,12,124,0,106,13,124,1,
95,14,87,0,110,18,4,0,116,3,121,224,1,0,1,0,
1,0,89,0,110,2,48,0,122,10,124,0,124,1,95,15,
1,0,89,0,110,2,119,0,122,10,124,0,124,1,95,15,
87,0,110,18,4,0,116,3,121,254,1,0,1,0,1,0,
89,0,110,2,48,0,124,2,144,1,115,24,116,0,124,1,
89,0,110,2,119,0,124,2,144,1,115,24,116,0,124,1,
100,4,100,0,131,3,100,0,117,0,144,1,114,70,124,0,
106,5,100,0,117,1,144,1,114,70,122,12,124,0,106,5,
124,1,95,16,87,0,110,20,4,0,116,3,144,1,121,68,
1,0,1,0,1,0,89,0,110,2,48,0,124,0,106,17,
1,0,1,0,1,0,89,0,110,2,119,0,124,0,106,17,
144,1,114,210,124,2,144,1,115,102,116,0,124,1,100,5,
100,0,131,3,100,0,117,0,144,1,114,136,122,12,124,0,
106,18,124,1,95,11,87,0,110,20,4,0,116,3,144,1,
121,134,1,0,1,0,1,0,89,0,110,2,48,0,124,2,
121,134,1,0,1,0,1,0,89,0,110,2,119,0,124,2,
144,1,115,160,116,0,124,1,100,6,100,0,131,3,100,0,
117,0,144,1,114,210,124,0,106,19,100,0,117,1,144,1,
114,210,122,14,124,0,106,19,124,1,95,20,87,0,124,1,
83,0,4,0,116,3,144,1,121,208,1,0,1,0,1,0,
89,0,124,1,83,0,48,0,124,1,83,0,41,7,78,114,
89,0,124,1,83,0,119,0,124,1,83,0,41,7,78,114,
9,0,0,0,114,106,0,0,0,218,11,95,95,112,97,99,
107,97,103,101,95,95,114,148,0,0,0,114,115,0,0,0,
114,146,0,0,0,41,21,114,13,0,0,0,114,20,0,0,
@ -953,9 +953,9 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
1,1,0,87,0,116,2,106,3,160,17,124,0,106,0,161,
1,125,1,124,1,116,2,106,3,124,0,106,0,60,0,110,
28,116,2,106,3,160,17,124,0,106,0,161,1,125,1,124,
1,116,2,106,3,124,0,106,0,60,0,48,0,87,0,100,
1,116,2,106,3,124,0,106,0,60,0,119,0,87,0,100,
3,4,0,4,0,131,3,1,0,124,1,83,0,49,0,144,
1,115,12,48,0,1,0,1,0,1,0,89,0,1,0,124,
1,115,12,119,1,1,0,1,0,1,0,89,0,1,0,124,
1,83,0,41,9,122,70,69,120,101,99,117,116,101,32,116,
104,101,32,115,112,101,99,39,115,32,115,112,101,99,105,102,
105,101,100,32,109,111,100,117,108,101,32,105,110,32,97,110,
@ -992,15 +992,15 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
3,106,4,124,0,106,2,60,0,116,6,124,1,100,1,100,
0,131,3,100,0,117,0,114,140,122,12,124,0,106,0,124,
1,95,7,87,0,110,18,4,0,116,8,121,138,1,0,1,
0,1,0,89,0,110,2,48,0,116,6,124,1,100,2,100,
0,1,0,89,0,110,2,119,0,116,6,124,1,100,2,100,
0,131,3,100,0,117,0,114,216,122,40,124,1,106,9,124,
1,95,10,116,11,124,1,100,3,131,2,115,194,124,0,106,
2,160,12,100,4,161,1,100,5,25,0,124,1,95,10,87,
0,110,18,4,0,116,8,121,214,1,0,1,0,1,0,89,
0,110,2,48,0,116,6,124,1,100,6,100,0,131,3,100,
0,110,2,119,0,116,6,124,1,100,6,100,0,131,3,100,
0,117,0,144,1,114,14,122,12,124,0,124,1,95,13,87,
0,124,1,83,0,4,0,116,8,144,1,121,12,1,0,1,
0,1,0,89,0,124,1,83,0,48,0,124,1,83,0,41,
0,1,0,89,0,124,1,83,0,119,0,124,1,83,0,41,
7,78,114,106,0,0,0,114,152,0,0,0,114,148,0,0,
0,114,135,0,0,0,114,25,0,0,0,114,113,0,0,0,
41,14,114,116,0,0,0,114,164,0,0,0,114,20,0,0,
@ -1028,10 +1028,10 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
14,124,2,161,1,1,0,87,0,110,40,1,0,1,0,1,
0,122,14,116,9,106,10,124,0,106,11,61,0,87,0,130,
0,4,0,116,15,121,176,1,0,1,0,1,0,89,0,130,
0,48,0,116,9,106,10,160,16,124,0,106,11,161,1,125,
0,119,0,116,9,106,10,160,16,124,0,106,11,161,1,125,
2,124,2,116,9,106,10,124,0,106,11,60,0,116,17,100,
6,124,0,106,11,124,0,106,0,131,3,1,0,87,0,100,
7,124,0,95,8,124,2,83,0,100,7,124,0,95,8,48,
7,124,0,95,8,124,2,83,0,100,7,124,0,95,8,119,
0,41,8,78,114,157,0,0,0,114,162,0,0,0,84,114,
161,0,0,0,114,19,0,0,0,122,18,105,109,112,111,114,
116,32,123,33,114,125,32,35,32,123,33,114,125,70,41,18,
@ -1053,7 +1053,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
0,67,0,0,0,115,54,0,0,0,116,0,124,0,106,1,
131,1,143,24,1,0,116,2,124,0,131,1,87,0,2,0,
100,1,4,0,4,0,131,3,1,0,83,0,49,0,115,40,
48,0,1,0,1,0,1,0,89,0,1,0,100,1,83,0,
119,1,1,0,1,0,1,0,89,0,1,0,100,1,83,0,
41,2,122,191,82,101,116,117,114,110,32,97,32,110,101,119,
32,109,111,100,117,108,101,32,111,98,106,101,99,116,44,32,
108,111,97,100,101,100,32,98,121,32,116,104,101,32,115,112,
@ -1429,14 +1429,14 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
4,0,116,9,121,128,1,0,1,0,1,0,116,10,124,5,
124,0,124,1,131,3,125,7,124,7,100,1,117,0,114,124,
89,0,87,0,100,1,4,0,4,0,131,3,1,0,113,52,
89,0,110,14,48,0,124,6,124,0,124,1,124,2,131,3,
89,0,110,14,119,0,124,6,124,0,124,1,124,2,131,3,
125,7,87,0,100,1,4,0,4,0,131,3,1,0,110,16,
49,0,115,162,48,0,1,0,1,0,1,0,89,0,1,0,
49,0,115,162,119,1,1,0,1,0,1,0,89,0,1,0,
124,7,100,1,117,1,114,52,124,4,144,1,115,16,124,0,
116,0,106,6,118,0,144,1,114,16,116,0,106,6,124,0,
25,0,125,8,122,10,124,8,106,11,125,9,87,0,110,26,
4,0,116,9,121,244,1,0,1,0,1,0,124,7,6,0,
89,0,2,0,1,0,83,0,48,0,124,9,100,1,117,0,
89,0,2,0,1,0,83,0,119,0,124,9,100,1,117,0,
144,1,114,8,124,7,2,0,1,0,83,0,124,9,2,0,
1,0,83,0,124,7,2,0,1,0,83,0,100,1,83,0,
41,4,122,21,70,105,110,100,32,97,32,109,111,100,117,108,
@ -1500,7 +1500,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
1,106,2,124,3,25,0,125,4,122,10,124,4,106,4,125,
2,87,0,110,44,4,0,116,5,121,126,1,0,1,0,1,
0,116,6,100,3,23,0,160,7,124,0,124,3,161,2,125,
5,116,8,124,5,124,0,100,4,141,2,100,0,130,2,48,
5,116,8,124,5,124,0,100,4,141,2,100,0,130,2,119,
0,116,9,124,0,124,2,131,2,125,6,124,6,100,0,117,
0,114,164,116,8,116,6,160,7,124,0,161,1,124,0,100,
4,141,2,130,1,116,10,124,6,131,1,125,7,124,3,144,
@ -1509,7 +1509,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
4,124,8,124,7,131,3,1,0,87,0,124,7,83,0,4,
0,116,5,144,1,121,14,1,0,1,0,1,0,100,6,124,
3,155,2,100,7,124,8,155,2,157,4,125,5,116,12,160,
13,124,5,116,14,161,2,1,0,89,0,124,7,83,0,48,
13,124,5,116,14,161,2,1,0,89,0,124,7,83,0,119,
0,124,7,83,0,41,8,78,114,135,0,0,0,114,25,0,
0,0,122,23,59,32,123,33,114,125,32,105,115,32,110,111,
116,32,97,32,112,97,99,107,97,103,101,114,19,0,0,0,
@ -1540,7 +1540,7 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
2,116,4,117,0,114,56,116,5,124,0,124,1,131,2,87,
0,2,0,100,1,4,0,4,0,131,3,1,0,83,0,87,
0,100,1,4,0,4,0,131,3,1,0,110,16,49,0,115,
76,48,0,1,0,1,0,1,0,89,0,1,0,124,2,100,
76,119,1,1,0,1,0,1,0,89,0,1,0,124,2,100,
1,117,0,114,116,100,2,160,6,124,0,161,1,125,3,116,
7,124,3,124,0,100,3,141,2,130,1,116,8,124,0,131,
1,1,0,124,2,83,0,41,4,122,25,70,105,110,100,32,
@ -1602,8 +1602,8 @@ const unsigned char _Py_M__importlib_bootstrap[] = {
4,4,0,116,10,121,214,1,0,125,7,1,0,122,42,124,
7,106,11,124,6,107,2,114,200,116,12,106,13,160,14,124,
6,116,15,161,2,100,10,117,1,114,200,87,0,89,0,100,
10,125,7,126,7,113,4,130,0,100,10,125,7,126,7,48,
0,124,0,83,0,48,0,41,11,122,238,70,105,103,117,114,
10,125,7,126,7,113,4,130,0,100,10,125,7,126,7,119,
1,124,0,83,0,119,0,41,11,122,238,70,105,103,117,114,
101,32,111,117,116,32,119,104,97,116,32,95,95,105,109,112,
111,114,116,95,95,32,115,104,111,117,108,100,32,114,101,116,
117,114,110,46,10,10,32,32,32,32,84,104,101,32,105,109,

276
Python/importlib_external.h generated
View File

File diff suppressed because it is too large Load Diff

52
Python/importlib_zipimport.h
View File

@ -128,11 +128,11 @@ const unsigned char _Py_M__zipimport[] = {
12,124,1,161,1,92,2,125,5,125,6,124,5,124,1,107,
2,114,132,116,4,100,5,124,1,100,3,141,2,130,1,124,
5,125,1,124,3,160,13,124,6,161,1,1,0,89,0,110,
28,48,0,124,4,106,14,100,6,64,0,100,7,107,3,114,
28,119,0,124,4,106,14,100,6,64,0,100,7,107,3,114,
180,116,4,100,5,124,1,100,3,141,2,130,1,113,66,122,
12,116,15,124,1,25,0,125,7,87,0,110,34,4,0,116,
16,121,226,1,0,1,0,1,0,116,17,124,1,131,1,125,
7,124,7,116,15,124,1,60,0,89,0,110,2,48,0,124,
7,124,7,116,15,124,1,60,0,89,0,110,2,119,0,124,
7,124,0,95,18,124,1,124,0,95,19,116,8,106,20,124,
3,100,0,100,0,100,8,133,3,25,0,142,0,124,0,95,
21,124,0,106,21,144,1,114,32,124,0,4,0,106,21,116,
@ -319,7 +319,7 @@ const unsigned char _Py_M__zipimport[] = {
0,106,4,116,2,23,0,131,1,100,1,133,2,25,0,125,
2,122,14,124,0,106,6,124,2,25,0,125,3,87,0,110,
26,4,0,116,7,121,98,1,0,1,0,1,0,116,8,100,
2,100,3,124,2,131,3,130,1,48,0,116,9,124,0,106,
2,100,3,124,2,131,3,130,1,119,0,116,9,124,0,106,
4,124,3,131,2,83,0,41,4,122,154,103,101,116,95,100,
97,116,97,40,112,97,116,104,110,97,109,101,41,32,45,62,
32,115,116,114,105,110,103,32,119,105,116,104,32,102,105,108,
@ -365,7 +365,7 @@ const unsigned char _Py_M__zipimport[] = {
160,4,124,3,100,4,161,2,125,4,110,10,124,3,155,0,
100,5,157,2,125,4,122,14,124,0,106,5,124,4,25,0,
125,5,87,0,110,20,4,0,116,6,121,108,1,0,1,0,
1,0,89,0,100,1,83,0,48,0,116,7,124,0,106,8,
1,0,89,0,100,1,83,0,119,0,116,7,124,0,106,8,
124,5,131,2,160,9,161,0,83,0,41,6,122,253,103,101,
116,95,115,111,117,114,99,101,40,102,117,108,108,110,97,109,
101,41,32,45,62,32,115,111,117,114,99,101,32,115,116,114,
@ -434,7 +434,7 @@ const unsigned char _Py_M__zipimport[] = {
16,1,0,1,0,1,0,116,4,106,5,124,1,61,0,130,
0,122,14,116,4,106,5,124,1,25,0,125,6,87,0,110,
30,4,0,116,20,121,232,1,0,1,0,1,0,116,21,100,
4,124,1,155,2,100,5,157,3,131,1,130,1,48,0,116,
4,124,1,155,2,100,5,157,3,131,1,130,1,119,0,116,
22,160,23,100,6,124,1,124,5,161,3,1,0,124,6,83,
0,41,7,97,55,1,0,0,108,111,97,100,95,109,111,100,
117,108,101,40,102,117,108,108,110,97,109,101,41,32,45,62,
@ -496,7 +496,7 @@ const unsigned char _Py_M__zipimport[] = {
3,0,0,0,8,0,0,0,67,0,0,0,115,64,0,0,
0,122,20,124,0,160,0,124,1,161,1,115,18,87,0,100,
1,83,0,87,0,110,20,4,0,116,1,121,40,1,0,1,
0,1,0,89,0,100,1,83,0,48,0,100,2,100,3,108,
0,1,0,89,0,100,1,83,0,119,0,100,2,100,3,108,
2,109,3,125,2,1,0,124,2,124,0,124,1,131,2,83,
0,41,4,122,204,82,101,116,117,114,110,32,116,104,101,32,
82,101,115,111,117,114,99,101,82,101,97,100,101,114,32,102,
@ -578,23 +578,23 @@ const unsigned char _Py_M__zipimport[] = {
0,0,0,115,232,4,0,0,122,14,116,0,160,1,124,0,
161,1,125,1,87,0,110,32,4,0,116,2,121,46,1,0,
1,0,1,0,116,3,100,1,124,0,155,2,157,2,124,0,
100,2,141,2,130,1,48,0,124,1,144,4,143,142,1,0,
100,2,141,2,130,1,119,0,124,1,144,4,143,142,1,0,
122,36,124,1,160,4,116,5,11,0,100,3,161,2,1,0,
124,1,160,6,161,0,125,2,124,1,160,7,116,5,161,1,
125,3,87,0,110,32,4,0,116,2,121,124,1,0,1,0,
1,0,116,3,100,4,124,0,155,2,157,2,124,0,100,2,
141,2,130,1,48,0,116,8,124,3,131,1,116,5,107,3,
141,2,130,1,119,0,116,8,124,3,131,1,116,5,107,3,
114,156,116,3,100,4,124,0,155,2,157,2,124,0,100,2,
141,2,130,1,124,3,100,0,100,5,133,2,25,0,116,9,
107,3,144,1,114,154,122,24,124,1,160,4,100,6,100,3,
161,2,1,0,124,1,160,6,161,0,125,4,87,0,110,32,
4,0,116,2,121,230,1,0,1,0,1,0,116,3,100,4,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,48,0,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,
116,10,124,4,116,11,24,0,116,5,24,0,100,6,131,2,
125,5,122,22,124,1,160,4,124,5,161,1,1,0,124,1,
160,7,161,0,125,6,87,0,110,34,4,0,116,2,144,1,
121,50,1,0,1,0,1,0,116,3,100,4,124,0,155,2,
157,2,124,0,100,2,141,2,130,1,48,0,124,6,160,12,
157,2,124,0,100,2,141,2,130,1,119,0,124,6,160,12,
116,9,161,1,125,7,124,7,100,6,107,0,144,1,114,90,
116,3,100,7,124,0,155,2,157,2,124,0,100,2,141,2,
130,1,124,6,124,7,124,7,116,5,23,0,133,2,25,0,
@ -612,7 +612,7 @@ const unsigned char _Py_M__zipimport[] = {
100,2,141,2,130,1,105,0,125,11,100,6,125,12,122,14,
124,1,160,4,124,2,161,1,1,0,87,0,110,34,4,0,
116,2,144,2,121,86,1,0,1,0,1,0,116,3,100,4,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,48,0,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,
9,0,124,1,160,7,100,16,161,1,125,3,116,8,124,3,
131,1,100,5,107,0,144,2,114,122,116,14,100,17,131,1,
130,1,124,3,100,0,100,5,133,2,25,0,100,18,107,3,
@ -634,7 +634,7 @@ const unsigned char _Py_M__zipimport[] = {
100,2,141,2,130,1,124,22,124,10,55,0,125,22,122,14,
124,1,160,7,124,19,161,1,125,23,87,0,110,34,4,0,
116,2,144,3,121,182,1,0,1,0,1,0,116,3,100,4,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,48,0,
124,0,155,2,157,2,124,0,100,2,141,2,130,1,119,0,
116,8,124,23,131,1,124,19,107,3,144,3,114,216,116,3,
100,4,124,0,155,2,157,2,124,0,100,2,141,2,130,1,
122,50,116,8,124,1,160,7,124,8,124,19,24,0,161,1,
@ -642,17 +642,17 @@ const unsigned char _Py_M__zipimport[] = {
100,4,124,0,155,2,157,2,124,0,100,2,141,2,130,1,
87,0,110,34,4,0,116,2,144,4,121,44,1,0,1,0,
1,0,116,3,100,4,124,0,155,2,157,2,124,0,100,2,
141,2,130,1,48,0,124,13,100,29,64,0,144,4,114,66,
141,2,130,1,119,0,124,13,100,29,64,0,144,4,114,66,
124,23,160,16,161,0,125,23,110,52,122,14,124,23,160,16,
100,30,161,1,125,23,87,0,110,36,4,0,116,17,144,4,
121,116,1,0,1,0,1,0,124,23,160,16,100,31,161,1,
160,18,116,19,161,1,125,23,89,0,110,2,48,0,124,23,
160,18,116,19,161,1,125,23,89,0,110,2,119,0,124,23,
160,20,100,32,116,21,161,2,125,23,116,22,160,23,124,0,
124,23,161,2,125,24,124,24,124,14,124,18,124,4,124,22,
124,15,124,16,124,17,102,8,125,25,124,25,124,11,124,23,
60,0,124,12,100,33,55,0,125,12,144,2,113,90,87,0,
100,0,4,0,4,0,131,3,1,0,110,18,49,0,144,4,
115,204,48,0,1,0,1,0,1,0,89,0,1,0,116,24,
115,204,119,1,1,0,1,0,1,0,89,0,1,0,116,24,
160,25,100,34,124,12,124,0,161,3,1,0,124,11,83,0,
41,35,78,122,21,99,97,110,39,116,32,111,112,101,110,32,
90,105,112,32,102,105,108,101,58,32,114,12,0,0,0,114,
@ -758,8 +758,8 @@ const unsigned char _Py_M__zipimport[] = {
100,3,97,0,122,58,122,16,100,4,100,5,108,4,109,5,
125,0,1,0,87,0,110,32,4,0,116,6,121,76,1,0,
1,0,1,0,116,1,160,2,100,1,161,1,1,0,116,3,
100,2,131,1,130,1,48,0,87,0,100,6,97,0,110,6,
100,6,97,0,48,0,116,1,160,2,100,7,161,1,1,0,
100,2,131,1,130,1,119,0,87,0,100,6,97,0,110,6,
100,6,97,0,119,0,116,1,160,2,100,7,161,1,1,0,
124,0,83,0,41,8,78,122,27,122,105,112,105,109,112,111,
114,116,58,32,122,108,105,98,32,85,78,65,86,65,73,76,
65,66,76,69,250,41,99,97,110,39,116,32,100,101,99,111,
@ -784,7 +784,7 @@ const unsigned char _Py_M__zipimport[] = {
2,124,0,161,1,144,1,143,6,125,10,122,14,124,10,160,
3,124,6,161,1,1,0,87,0,110,32,4,0,116,4,121,
96,1,0,1,0,1,0,116,0,100,3,124,0,155,2,157,
2,124,0,100,4,141,2,130,1,48,0,124,10,160,5,100,
2,124,0,100,4,141,2,130,1,119,0,124,10,160,5,100,
5,161,1,125,11,116,6,124,11,131,1,100,5,107,3,114,
128,116,7,100,6,131,1,130,1,124,11,100,0,100,7,133,
2,25,0,100,8,107,3,114,162,116,0,100,9,124,0,155,
@ -794,15 +794,15 @@ const unsigned char _Py_M__zipimport[] = {
0,124,13,23,0,125,14,124,6,124,14,55,0,125,6,122,
14,124,10,160,3,124,6,161,1,1,0,87,0,110,34,4,
0,116,4,144,1,121,6,1,0,1,0,1,0,116,0,100,
3,124,0,155,2,157,2,124,0,100,4,141,2,130,1,48,
3,124,0,155,2,157,2,124,0,100,4,141,2,130,1,119,
0,124,10,160,5,124,4,161,1,125,15,116,6,124,15,131,
1,124,4,107,3,144,1,114,40,116,4,100,12,131,1,130,
1,87,0,100,0,4,0,4,0,131,3,1,0,110,18,49,
0,144,1,115,62,48,0,1,0,1,0,1,0,89,0,1,
0,144,1,115,62,119,1,1,0,1,0,1,0,89,0,1,
0,124,3,100,1,107,2,144,1,114,86,124,15,83,0,122,
10,116,9,131,0,125,16,87,0,110,24,4,0,116,10,144,
1,121,120,1,0,1,0,1,0,116,0,100,13,131,1,130,
1,48,0,124,16,124,15,100,14,131,2,83,0,41,15,78,
1,119,0,124,16,124,15,100,14,131,2,83,0,41,15,78,
114,0,0,0,0,122,18,110,101,103,97,116,105,118,101,32,
100,97,116,97,32,115,105,122,101,114,94,0,0,0,114,12,
0,0,0,114,106,0,0,0,114,100,0,0,0,114,95,0,
@ -839,7 +839,7 @@ const unsigned char _Py_M__zipimport[] = {
0,124,3,124,2,100,1,156,2,125,5,122,18,116,0,160,
1,124,4,124,3,124,5,161,3,125,6,87,0,110,20,4,
0,116,2,121,48,1,0,1,0,1,0,89,0,100,0,83,
0,48,0,124,6,100,2,64,0,100,3,107,3,125,7,124,
0,119,0,124,6,100,2,64,0,100,3,107,3,125,7,124,
7,114,182,124,6,100,4,64,0,100,3,107,3,125,8,116,
3,106,4,100,5,107,3,144,1,114,10,124,8,115,106,116,
3,106,4,100,6,107,2,144,1,114,10,116,5,124,0,124,
@ -847,7 +847,7 @@ const unsigned char _Py_M__zipimport[] = {
3,160,6,116,0,106,7,124,9,161,2,125,10,122,20,116,
0,160,8,124,4,124,10,124,3,124,5,161,4,1,0,87,
0,110,104,4,0,116,2,121,180,1,0,1,0,1,0,89,
0,100,0,83,0,48,0,116,9,124,0,124,2,131,2,92,
0,100,0,83,0,119,0,116,9,124,0,124,2,131,2,92,
2,125,11,125,12,124,11,144,1,114,10,116,10,116,11,124,
4,100,7,100,8,133,2,25,0,131,1,124,11,131,2,114,
246,116,11,124,4,100,8,100,9,133,2,25,0,131,1,124,
@ -936,7 +936,7 @@ const unsigned char _Py_M__zipimport[] = {
100,4,25,0,125,4,124,2,100,5,25,0,125,5,116,1,
124,4,124,3,131,2,124,5,102,2,87,0,83,0,4,0,
116,2,116,3,116,4,102,3,121,108,1,0,1,0,1,0,
89,0,100,6,83,0,48,0,41,7,78,114,14,0,0,0,
89,0,100,6,83,0,119,0,41,7,78,114,14,0,0,0,
169,2,218,1,99,218,1,111,114,165,0,0,0,233,6,0,
0,0,233,3,0,0,0,41,2,114,0,0,0,0,114,0,
0,0,0,41,5,114,28,0,0,0,114,171,0,0,0,114,
@ -953,7 +953,7 @@ const unsigned char _Py_M__zipimport[] = {
2,25,0,100,2,118,0,115,20,74,0,130,1,124,1,100,
0,100,1,133,2,25,0,125,1,122,14,124,0,106,0,124,
1,25,0,125,2,87,0,110,20,4,0,116,1,121,66,1,
0,1,0,1,0,89,0,100,0,83,0,48,0,116,2,124,
0,1,0,1,0,89,0,100,0,83,0,119,0,116,2,124,
0,106,3,124,2,131,2,83,0,41,3,78,114,14,0,0,
0,114,172,0,0,0,41,4,114,28,0,0,0,114,26,0,
0,0,114,56,0,0,0,114,29,0,0,0,41,3,114,32,
@ -968,7 +968,7 @@ const unsigned char _Py_M__zipimport[] = {
3,100,1,124,0,106,4,116,5,124,6,100,2,100,3,141,
5,1,0,122,14,124,0,106,6,124,6,25,0,125,7,87,
0,110,18,4,0,116,7,121,86,1,0,1,0,1,0,89,
0,113,14,48,0,124,7,100,4,25,0,125,8,116,8,124,
0,113,14,119,0,124,7,100,4,25,0,125,8,116,8,124,
0,106,4,124,7,131,2,125,9,124,4,114,130,116,9,124,
0,124,8,124,6,124,1,124,9,131,5,125,10,110,10,116,
10,124,8,124,9,131,2,125,10,124,10,100,0,117,0,114,

4
Python/opcode_targets.h generated
View File

@ -47,7 +47,7 @@ static void *opcode_targets[256] = {
&&_unknown_opcode,
&&_unknown_opcode,
&&_unknown_opcode,
&&TARGET_RERAISE,
&&_unknown_opcode,
&&TARGET_WITH_EXCEPT_START,
&&TARGET_GET_AITER,
&&TARGET_GET_ANEXT,
@ -118,7 +118,7 @@ static void *opcode_targets[256] = {
&&TARGET_LOAD_GLOBAL,
&&TARGET_IS_OP,
&&TARGET_CONTAINS_OP,
&&_unknown_opcode,
&&TARGET_RERAISE,
&&_unknown_opcode,
&&TARGET_JUMP_IF_NOT_EXC_MATCH,
&&TARGET_SETUP_FINALLY,