From 7344285c1919e5ade8016a83a3ee02fd637a030d Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 2 Oct 2016 10:33:46 +0300 Subject: Issue #28257: Improved error message when pass a non-iterable as a var-positional argument. Added opcode BUILD_TUPLE_UNPACK_WITH_CALL. --- Include/opcode.h | 1 + Lib/importlib/_bootstrap_external.py | 3 +- Lib/opcode.py | 5 +- Lib/test/test_extcall.py | 10 ++ Misc/NEWS | 3 + Python/ceval.c | 13 ++- Python/compile.c | 4 +- Python/importlib_external.h | 212 +++++++++++++++++------------------ Python/opcode_targets.h | 2 +- 9 files changed, 140 insertions(+), 113 deletions(-) diff --git a/Include/opcode.h b/Include/opcode.h index 0903824..be360e1 100644 --- a/Include/opcode.h +++ b/Include/opcode.h @@ -125,6 +125,7 @@ extern "C" { #define FORMAT_VALUE 155 #define BUILD_CONST_KEY_MAP 156 #define BUILD_STRING 157 +#define BUILD_TUPLE_UNPACK_WITH_CALL 158 /* EXCEPT_HANDLER is a special, implicit block type which is created when entering an except handler. It is not an opcode but we define it here diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py index bfb89da..5cb58ab 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -238,6 +238,7 @@ _code_type = type(_write_atomic.__code__) # #27985) # Python 3.6b1 3376 (simplify CALL_FUNCTIONs & BUILD_MAP_UNPACK_WITH_CALL) # Python 3.6b1 3377 (set __class__ cell from type.__new__ #23722) +# Python 3.6b2 3378 (add BUILD_TUPLE_UNPACK_WITH_CALL #28257) # # MAGIC must change whenever the bytecode emitted by the compiler may no # longer be understood by older implementations of the eval loop (usually @@ -246,7 +247,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 = (3377).to_bytes(2, 'little') + b'\r\n' +MAGIC_NUMBER = (3378).to_bytes(2, 'little') + b'\r\n' _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c _PYCACHE = '__pycache__' diff --git a/Lib/opcode.py b/Lib/opcode.py index be26475..b5916b6 100644 --- a/Lib/opcode.py +++ b/Lib/opcode.py @@ -196,8 +196,6 @@ def_op('MAP_ADD', 147) def_op('LOAD_CLASSDEREF', 148) hasfree.append(148) -jrel_op('SETUP_ASYNC_WITH', 154) - def_op('EXTENDED_ARG', 144) EXTENDED_ARG = 144 @@ -207,8 +205,11 @@ def_op('BUILD_MAP_UNPACK_WITH_CALL', 151) def_op('BUILD_TUPLE_UNPACK', 152) def_op('BUILD_SET_UNPACK', 153) +jrel_op('SETUP_ASYNC_WITH', 154) + def_op('FORMAT_VALUE', 155) def_op('BUILD_CONST_KEY_MAP', 156) def_op('BUILD_STRING', 157) +def_op('BUILD_TUPLE_UNPACK_WITH_CALL', 158) del def_op, name_op, jrel_op, jabs_op diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index 5eea379..96f3ede 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -233,6 +233,16 @@ What about willful misconduct? ... TypeError: h() argument after * must be an iterable, not function + >>> h(1, *h) + Traceback (most recent call last): + ... + TypeError: h() argument after * must be an iterable, not function + + >>> h(*[1], *h) + Traceback (most recent call last): + ... + TypeError: h() argument after * must be an iterable, not function + >>> dir(*h) Traceback (most recent call last): ... diff --git a/Misc/NEWS b/Misc/NEWS index 831cb22..919674b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -46,6 +46,9 @@ Core and Builtins Library ------- +- Issue #28257: Improved error message when pass a non-iterable as + a var-positional argument. Added opcode BUILD_TUPLE_UNPACK_WITH_CALL. + - Issue #28322: Fixed possible crashes when unpickle itertools objects from incorrect pickle data. Based on patch by John Leitch. diff --git a/Python/ceval.c b/Python/ceval.c index 39cf330..717ac33 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2509,9 +2509,10 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) DISPATCH(); } + TARGET(BUILD_TUPLE_UNPACK_WITH_CALL) TARGET(BUILD_TUPLE_UNPACK) TARGET(BUILD_LIST_UNPACK) { - int convert_to_tuple = opcode == BUILD_TUPLE_UNPACK; + int convert_to_tuple = opcode != BUILD_LIST_UNPACK; Py_ssize_t i; PyObject *sum = PyList_New(0); PyObject *return_value; @@ -2524,6 +2525,16 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag) none_val = _PyList_Extend((PyListObject *)sum, PEEK(i)); if (none_val == NULL) { + if (opcode == BUILD_TUPLE_UNPACK_WITH_CALL && + PyErr_ExceptionMatches(PyExc_TypeError)) { + PyObject *func = PEEK(1 + oparg); + PyErr_Format(PyExc_TypeError, + "%.200s%.200s argument after * " + "must be an iterable, not %.200s", + PyEval_GetFuncName(func), + PyEval_GetFuncDesc(func), + PEEK(i)->ob_type->tp_name); + } Py_DECREF(sum); goto error; } diff --git a/Python/compile.c b/Python/compile.c index 9502fee..c0c81e1 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -987,9 +987,9 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) return 1-oparg; case BUILD_LIST_UNPACK: case BUILD_TUPLE_UNPACK: + case BUILD_TUPLE_UNPACK_WITH_CALL: case BUILD_SET_UNPACK: case BUILD_MAP_UNPACK: - return 1 - oparg; case BUILD_MAP_UNPACK_WITH_CALL: return 1 - oparg; case BUILD_MAP: @@ -3549,7 +3549,7 @@ compiler_call_helper(struct compiler *c, if (nsubargs > 1) { /* If we ended up with more than one stararg, we need to concatenate them into a single sequence. */ - ADDOP_I(c, BUILD_TUPLE_UNPACK, nsubargs); + ADDOP_I(c, BUILD_TUPLE_UNPACK_WITH_CALL, nsubargs); } else if (nsubargs == 0) { ADDOP_I(c, BUILD_TUPLE, 0); diff --git a/Python/importlib_external.h b/Python/importlib_external.h index 0b3b4d0..0afe7de 100644 --- a/Python/importlib_external.h +++ b/Python/importlib_external.h @@ -242,7 +242,7 @@ const unsigned char _Py_M__importlib_external[] = { 101,95,97,116,111,109,105,99,106,0,0,0,115,26,0,0, 0,0,5,16,1,6,1,26,1,2,3,14,1,20,1,16, 1,14,1,2,1,14,1,14,1,6,1,114,58,0,0,0, - 105,49,13,0,0,233,2,0,0,0,114,15,0,0,0,115, + 105,50,13,0,0,233,2,0,0,0,114,15,0,0,0,115, 2,0,0,0,13,10,90,11,95,95,112,121,99,97,99,104, 101,95,95,122,4,111,112,116,45,122,3,46,112,121,122,4, 46,112,121,99,78,41,1,218,12,111,112,116,105,109,105,122, @@ -346,7 +346,7 @@ const unsigned char _Py_M__importlib_external[] = { 103,90,15,97,108,109,111,115,116,95,102,105,108,101,110,97, 109,101,114,4,0,0,0,114,4,0,0,0,114,6,0,0, 0,218,17,99,97,99,104,101,95,102,114,111,109,95,115,111, - 117,114,99,101,5,1,0,0,115,48,0,0,0,0,18,8, + 117,114,99,101,6,1,0,0,115,48,0,0,0,0,18,8, 1,6,1,6,1,8,1,4,1,8,1,12,1,10,1,12, 1,16,1,8,1,8,1,8,1,24,1,8,1,12,1,6, 2,8,1,8,1,8,1,8,1,14,1,14,1,114,83,0, @@ -420,7 +420,7 @@ const unsigned char _Py_M__importlib_external[] = { 112,116,95,108,101,118,101,108,90,13,98,97,115,101,95,102, 105,108,101,110,97,109,101,114,4,0,0,0,114,4,0,0, 0,114,6,0,0,0,218,17,115,111,117,114,99,101,95,102, - 114,111,109,95,99,97,99,104,101,50,1,0,0,115,46,0, + 114,111,109,95,99,97,99,104,101,51,1,0,0,115,46,0, 0,0,0,9,12,1,8,1,10,1,12,1,12,1,8,1, 6,1,10,1,10,1,8,1,6,1,10,1,8,1,16,1, 10,1,6,1,8,1,16,1,8,1,6,1,8,1,14,1, @@ -456,7 +456,7 @@ const unsigned char _Py_M__importlib_external[] = { 115,105,111,110,218,11,115,111,117,114,99,101,95,112,97,116, 104,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, 218,15,95,103,101,116,95,115,111,117,114,99,101,102,105,108, - 101,84,1,0,0,115,20,0,0,0,0,7,12,1,4,1, + 101,85,1,0,0,115,20,0,0,0,0,7,12,1,4,1, 16,1,26,1,4,1,2,1,12,1,18,1,18,1,114,95, 0,0,0,99,1,0,0,0,0,0,0,0,1,0,0,0, 11,0,0,0,67,0,0,0,115,74,0,0,0,124,0,106, @@ -469,7 +469,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,114,83,0,0,0,114,70,0,0,0,114,78,0,0, 0,41,1,218,8,102,105,108,101,110,97,109,101,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,218,11,95,103, - 101,116,95,99,97,99,104,101,100,103,1,0,0,115,16,0, + 101,116,95,99,97,99,104,101,100,104,1,0,0,115,16,0, 0,0,0,1,14,1,2,1,8,1,14,1,8,1,14,1, 6,2,114,99,0,0,0,99,1,0,0,0,0,0,0,0, 2,0,0,0,11,0,0,0,67,0,0,0,115,52,0,0, @@ -483,7 +483,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,233,128,0,0,0,41,3,114,41,0,0,0,114,43,0, 0,0,114,42,0,0,0,41,2,114,37,0,0,0,114,44, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,10,95,99,97,108,99,95,109,111,100,101,115,1, + 0,0,218,10,95,99,97,108,99,95,109,111,100,101,116,1, 0,0,115,12,0,0,0,0,2,2,1,14,1,14,1,10, 3,8,1,114,101,0,0,0,99,1,0,0,0,0,0,0, 0,3,0,0,0,11,0,0,0,3,0,0,0,115,68,0, @@ -512,7 +512,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,124,1,100,0,107,8,114,16,124,0,106,0,125,1,110, 32,124,0,106,0,124,1,107,3,114,48,116,1,100,1,124, 0,106,0,124,1,102,2,22,0,124,1,100,2,141,2,130, - 1,136,0,124,0,124,1,102,2,124,2,152,2,124,3,142, + 1,136,0,124,0,124,1,102,2,124,2,158,2,124,3,142, 1,83,0,41,3,78,122,30,108,111,97,100,101,114,32,102, 111,114,32,37,115,32,99,97,110,110,111,116,32,104,97,110, 100,108,101,32,37,115,41,1,218,4,110,97,109,101,41,2, @@ -521,7 +521,7 @@ const unsigned char _Py_M__importlib_external[] = { 4,97,114,103,115,90,6,107,119,97,114,103,115,41,1,218, 6,109,101,116,104,111,100,114,4,0,0,0,114,6,0,0, 0,218,19,95,99,104,101,99,107,95,110,97,109,101,95,119, - 114,97,112,112,101,114,135,1,0,0,115,12,0,0,0,0, + 114,97,112,112,101,114,136,1,0,0,115,12,0,0,0,0, 1,8,1,8,1,10,1,4,1,18,1,122,40,95,99,104, 101,99,107,95,110,97,109,101,46,60,108,111,99,97,108,115, 62,46,95,99,104,101,99,107,95,110,97,109,101,95,119,114, @@ -540,7 +540,7 @@ const unsigned char _Py_M__importlib_external[] = { 95,95,100,105,99,116,95,95,218,6,117,112,100,97,116,101, 41,3,90,3,110,101,119,90,3,111,108,100,114,55,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 218,5,95,119,114,97,112,146,1,0,0,115,8,0,0,0, + 218,5,95,119,114,97,112,147,1,0,0,115,8,0,0,0, 0,1,10,1,10,1,22,1,122,26,95,99,104,101,99,107, 95,110,97,109,101,46,60,108,111,99,97,108,115,62,46,95, 119,114,97,112,41,1,78,41,3,218,10,95,98,111,111,116, @@ -548,7 +548,7 @@ const unsigned char _Py_M__importlib_external[] = { 69,114,114,111,114,41,3,114,106,0,0,0,114,107,0,0, 0,114,117,0,0,0,114,4,0,0,0,41,1,114,106,0, 0,0,114,6,0,0,0,218,11,95,99,104,101,99,107,95, - 110,97,109,101,127,1,0,0,115,14,0,0,0,0,8,14, + 110,97,109,101,128,1,0,0,115,14,0,0,0,0,8,14, 7,2,1,10,1,14,2,14,5,10,1,114,120,0,0,0, 99,2,0,0,0,0,0,0,0,5,0,0,0,4,0,0, 0,67,0,0,0,115,60,0,0,0,124,0,106,0,124,1, @@ -576,7 +576,7 @@ const unsigned char _Py_M__importlib_external[] = { 97,100,101,114,218,8,112,111,114,116,105,111,110,115,218,3, 109,115,103,114,4,0,0,0,114,4,0,0,0,114,6,0, 0,0,218,17,95,102,105,110,100,95,109,111,100,117,108,101, - 95,115,104,105,109,155,1,0,0,115,10,0,0,0,0,10, + 95,115,104,105,109,156,1,0,0,115,10,0,0,0,0,10, 14,1,16,1,4,1,22,1,114,127,0,0,0,99,4,0, 0,0,0,0,0,0,11,0,0,0,22,0,0,0,67,0, 0,0,115,136,1,0,0,105,0,125,4,124,2,100,1,107, @@ -656,7 +656,7 @@ const unsigned char _Py_M__importlib_external[] = { 218,11,115,111,117,114,99,101,95,115,105,122,101,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,218,25,95,118, 97,108,105,100,97,116,101,95,98,121,116,101,99,111,100,101, - 95,104,101,97,100,101,114,172,1,0,0,115,76,0,0,0, + 95,104,101,97,100,101,114,173,1,0,0,115,76,0,0,0, 0,11,4,1,8,1,10,3,4,1,8,1,8,1,12,1, 12,1,12,1,8,1,12,1,12,1,14,1,12,1,10,1, 12,1,10,1,12,1,10,1,12,1,8,1,10,1,2,1, @@ -685,7 +685,7 @@ const unsigned char _Py_M__importlib_external[] = { 41,5,114,56,0,0,0,114,102,0,0,0,114,93,0,0, 0,114,94,0,0,0,218,4,99,111,100,101,114,4,0,0, 0,114,4,0,0,0,114,6,0,0,0,218,17,95,99,111, - 109,112,105,108,101,95,98,121,116,101,99,111,100,101,227,1, + 109,112,105,108,101,95,98,121,116,101,99,111,100,101,228,1, 0,0,115,16,0,0,0,0,2,10,1,10,1,12,1,8, 1,12,1,6,2,10,1,114,145,0,0,0,114,62,0,0, 0,99,3,0,0,0,0,0,0,0,4,0,0,0,3,0, @@ -704,7 +704,7 @@ const unsigned char _Py_M__importlib_external[] = { 112,115,41,4,114,144,0,0,0,114,130,0,0,0,114,138, 0,0,0,114,56,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,6,0,0,0,218,17,95,99,111,100,101,95,116, - 111,95,98,121,116,101,99,111,100,101,239,1,0,0,115,10, + 111,95,98,121,116,101,99,111,100,101,240,1,0,0,115,10, 0,0,0,0,3,8,1,14,1,14,1,16,1,114,148,0, 0,0,99,1,0,0,0,0,0,0,0,5,0,0,0,4, 0,0,0,67,0,0,0,115,62,0,0,0,100,1,100,2, @@ -731,7 +731,7 @@ const unsigned char _Py_M__importlib_external[] = { 110,101,218,8,101,110,99,111,100,105,110,103,90,15,110,101, 119,108,105,110,101,95,100,101,99,111,100,101,114,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,218,13,100,101, - 99,111,100,101,95,115,111,117,114,99,101,249,1,0,0,115, + 99,111,100,101,95,115,111,117,114,99,101,250,1,0,0,115, 10,0,0,0,0,5,8,1,12,1,10,1,12,1,114,153, 0,0,0,41,2,114,124,0,0,0,218,26,115,117,98,109, 111,100,117,108,101,95,115,101,97,114,99,104,95,108,111,99, @@ -793,7 +793,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,90,7,100,105,114,110,97,109,101,114,4,0,0, 0,114,4,0,0,0,114,6,0,0,0,218,23,115,112,101, 99,95,102,114,111,109,95,102,105,108,101,95,108,111,99,97, - 116,105,111,110,10,2,0,0,115,62,0,0,0,0,12,8, + 116,105,111,110,11,2,0,0,115,62,0,0,0,0,12,8, 4,4,1,10,2,2,1,14,1,14,1,8,2,10,8,16, 1,6,3,8,1,16,1,14,1,10,1,6,1,6,2,4, 3,8,2,10,1,2,1,14,1,14,1,6,2,4,1,8, @@ -829,7 +829,7 @@ const unsigned char _Py_M__importlib_external[] = { 18,72,75,69,89,95,76,79,67,65,76,95,77,65,67,72, 73,78,69,41,2,218,3,99,108,115,114,5,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,14, - 95,111,112,101,110,95,114,101,103,105,115,116,114,121,90,2, + 95,111,112,101,110,95,114,101,103,105,115,116,114,121,91,2, 0,0,115,8,0,0,0,0,2,2,1,14,1,14,1,122, 36,87,105,110,100,111,119,115,82,101,103,105,115,116,114,121, 70,105,110,100,101,114,46,95,111,112,101,110,95,114,101,103, @@ -855,7 +855,7 @@ const unsigned char _Py_M__importlib_external[] = { 121,95,107,101,121,114,5,0,0,0,90,4,104,107,101,121, 218,8,102,105,108,101,112,97,116,104,114,4,0,0,0,114, 4,0,0,0,114,6,0,0,0,218,16,95,115,101,97,114, - 99,104,95,114,101,103,105,115,116,114,121,97,2,0,0,115, + 99,104,95,114,101,103,105,115,116,114,121,98,2,0,0,115, 22,0,0,0,0,2,6,1,8,2,6,1,6,1,22,1, 2,1,12,1,26,1,14,1,6,1,122,38,87,105,110,100, 111,119,115,82,101,103,105,115,116,114,121,70,105,110,100,101, @@ -877,7 +877,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,114,37,0,0,0,218,6,116,97,114,103,101,116,114, 174,0,0,0,114,124,0,0,0,114,164,0,0,0,114,162, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,9,102,105,110,100,95,115,112,101,99,112,2,0, + 0,0,218,9,102,105,110,100,95,115,112,101,99,113,2,0, 0,115,26,0,0,0,0,2,10,1,8,1,4,1,2,1, 12,1,14,1,6,1,16,1,14,1,6,1,8,1,8,1, 122,31,87,105,110,100,111,119,115,82,101,103,105,115,116,114, @@ -896,7 +896,7 @@ const unsigned char _Py_M__importlib_external[] = { 41,2,114,178,0,0,0,114,124,0,0,0,41,4,114,168, 0,0,0,114,123,0,0,0,114,37,0,0,0,114,162,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,218,11,102,105,110,100,95,109,111,100,117,108,101,128,2, + 0,218,11,102,105,110,100,95,109,111,100,117,108,101,129,2, 0,0,115,8,0,0,0,0,7,12,1,8,1,8,2,122, 33,87,105,110,100,111,119,115,82,101,103,105,115,116,114,121, 70,105,110,100,101,114,46,102,105,110,100,95,109,111,100,117, @@ -906,7 +906,7 @@ const unsigned char _Py_M__importlib_external[] = { 99,108,97,115,115,109,101,116,104,111,100,114,169,0,0,0, 114,175,0,0,0,114,178,0,0,0,114,179,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,166,0,0,0,78,2,0,0,115,20,0,0, + 0,0,0,114,166,0,0,0,79,2,0,0,115,20,0,0, 0,8,2,4,3,4,3,4,2,4,2,12,7,12,15,2, 1,12,15,2,1,114,166,0,0,0,99,0,0,0,0,0, 0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,115, @@ -941,7 +941,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,123,0,0,0,114,98,0,0,0,90,13,102,105,108,101, 110,97,109,101,95,98,97,115,101,90,9,116,97,105,108,95, 110,97,109,101,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,157,0,0,0,147,2,0,0,115,8,0,0, + 0,0,0,114,157,0,0,0,148,2,0,0,115,8,0,0, 0,0,3,18,1,16,1,14,1,122,24,95,76,111,97,100, 101,114,66,97,115,105,99,115,46,105,115,95,112,97,99,107, 97,103,101,99,2,0,0,0,0,0,0,0,2,0,0,0, @@ -951,7 +951,7 @@ const unsigned char _Py_M__importlib_external[] = { 111,100,117,108,101,32,99,114,101,97,116,105,111,110,46,78, 114,4,0,0,0,41,2,114,104,0,0,0,114,162,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 218,13,99,114,101,97,116,101,95,109,111,100,117,108,101,155, + 218,13,99,114,101,97,116,101,95,109,111,100,117,108,101,156, 2,0,0,115,0,0,0,0,122,27,95,76,111,97,100,101, 114,66,97,115,105,99,115,46,99,114,101,97,116,101,95,109, 111,100,117,108,101,99,2,0,0,0,0,0,0,0,3,0, @@ -971,7 +971,7 @@ const unsigned char _Py_M__importlib_external[] = { 218,4,101,120,101,99,114,115,0,0,0,41,3,114,104,0, 0,0,218,6,109,111,100,117,108,101,114,144,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,11, - 101,120,101,99,95,109,111,100,117,108,101,158,2,0,0,115, + 101,120,101,99,95,109,111,100,117,108,101,159,2,0,0,115, 10,0,0,0,0,2,12,1,8,1,6,1,10,1,122,25, 95,76,111,97,100,101,114,66,97,115,105,99,115,46,101,120, 101,99,95,109,111,100,117,108,101,99,2,0,0,0,0,0, @@ -982,14 +982,14 @@ const unsigned char _Py_M__importlib_external[] = { 118,0,0,0,218,17,95,108,111,97,100,95,109,111,100,117, 108,101,95,115,104,105,109,41,2,114,104,0,0,0,114,123, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,166, + 0,0,218,11,108,111,97,100,95,109,111,100,117,108,101,167, 2,0,0,115,2,0,0,0,0,2,122,25,95,76,111,97, 100,101,114,66,97,115,105,99,115,46,108,111,97,100,95,109, 111,100,117,108,101,78,41,8,114,109,0,0,0,114,108,0, 0,0,114,110,0,0,0,114,111,0,0,0,114,157,0,0, 0,114,183,0,0,0,114,188,0,0,0,114,190,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,181,0,0,0,142,2,0,0,115,10,0, + 6,0,0,0,114,181,0,0,0,143,2,0,0,115,10,0, 0,0,8,3,4,2,8,8,8,3,8,8,114,181,0,0, 0,99,0,0,0,0,0,0,0,0,0,0,0,0,3,0, 0,0,64,0,0,0,115,74,0,0,0,101,0,90,1,100, @@ -1015,7 +1015,7 @@ const unsigned char _Py_M__importlib_external[] = { 218,7,73,79,69,114,114,111,114,41,2,114,104,0,0,0, 114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114, 6,0,0,0,218,10,112,97,116,104,95,109,116,105,109,101, - 173,2,0,0,115,2,0,0,0,0,6,122,23,83,111,117, + 174,2,0,0,115,2,0,0,0,0,6,122,23,83,111,117, 114,99,101,76,111,97,100,101,114,46,112,97,116,104,95,109, 116,105,109,101,99,2,0,0,0,0,0,0,0,2,0,0, 0,3,0,0,0,67,0,0,0,115,14,0,0,0,100,1, @@ -1050,7 +1050,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,41,1,114,193,0,0,0,41,2,114,104,0,0,0, 114,37,0,0,0,114,4,0,0,0,114,4,0,0,0,114, 6,0,0,0,218,10,112,97,116,104,95,115,116,97,116,115, - 181,2,0,0,115,2,0,0,0,0,11,122,23,83,111,117, + 182,2,0,0,115,2,0,0,0,0,11,122,23,83,111,117, 114,99,101,76,111,97,100,101,114,46,112,97,116,104,95,115, 116,97,116,115,99,4,0,0,0,0,0,0,0,4,0,0, 0,3,0,0,0,67,0,0,0,115,12,0,0,0,124,0, @@ -1073,7 +1073,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,104,0,0,0,114,94,0,0,0,90,10,99,97,99,104, 101,95,112,97,116,104,114,56,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,6,0,0,0,218,15,95,99,97,99, - 104,101,95,98,121,116,101,99,111,100,101,194,2,0,0,115, + 104,101,95,98,121,116,101,99,111,100,101,195,2,0,0,115, 2,0,0,0,0,8,122,28,83,111,117,114,99,101,76,111, 97,100,101,114,46,95,99,97,99,104,101,95,98,121,116,101, 99,111,100,101,99,3,0,0,0,0,0,0,0,3,0,0, @@ -1090,7 +1090,7 @@ const unsigned char _Py_M__importlib_external[] = { 101,115,46,10,32,32,32,32,32,32,32,32,78,114,4,0, 0,0,41,3,114,104,0,0,0,114,37,0,0,0,114,56, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,114,195,0,0,0,204,2,0,0,115,0,0,0,0, + 0,0,114,195,0,0,0,205,2,0,0,115,0,0,0,0, 122,21,83,111,117,114,99,101,76,111,97,100,101,114,46,115, 101,116,95,100,97,116,97,99,2,0,0,0,0,0,0,0, 5,0,0,0,16,0,0,0,67,0,0,0,115,82,0,0, @@ -1111,7 +1111,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,114,123,0,0,0,114,37,0,0,0,114,151,0, 0,0,218,3,101,120,99,114,4,0,0,0,114,4,0,0, 0,114,6,0,0,0,218,10,103,101,116,95,115,111,117,114, - 99,101,211,2,0,0,115,14,0,0,0,0,2,10,1,2, + 99,101,212,2,0,0,115,14,0,0,0,0,2,10,1,2, 1,14,1,16,1,4,1,28,1,122,23,83,111,117,114,99, 101,76,111,97,100,101,114,46,103,101,116,95,115,111,117,114, 99,101,114,31,0,0,0,41,1,218,9,95,111,112,116,105, @@ -1132,7 +1132,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,218,7,99,111,109,112,105,108,101,41,4,114,104,0,0, 0,114,56,0,0,0,114,37,0,0,0,114,200,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,218, - 14,115,111,117,114,99,101,95,116,111,95,99,111,100,101,221, + 14,115,111,117,114,99,101,95,116,111,95,99,111,100,101,222, 2,0,0,115,4,0,0,0,0,5,12,1,122,27,83,111, 117,114,99,101,76,111,97,100,101,114,46,115,111,117,114,99, 101,95,116,111,95,99,111,100,101,99,2,0,0,0,0,0, @@ -1189,7 +1189,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,56,0,0,0,218,10,98,121,116,101,115,95,100,97,116, 97,114,151,0,0,0,90,11,99,111,100,101,95,111,98,106, 101,99,116,114,4,0,0,0,114,4,0,0,0,114,6,0, - 0,0,114,184,0,0,0,229,2,0,0,115,78,0,0,0, + 0,0,114,184,0,0,0,230,2,0,0,115,78,0,0,0, 0,7,10,1,4,1,2,1,12,1,14,1,10,2,2,1, 14,1,14,1,6,2,12,1,2,1,14,1,14,1,6,2, 2,1,4,1,4,1,12,1,18,1,6,2,8,1,6,1, @@ -1201,7 +1201,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,194,0,0,0,114,196,0,0,0,114,195,0,0,0, 114,199,0,0,0,114,203,0,0,0,114,184,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,191,0,0,0,171,2,0,0,115,14,0,0, + 0,0,0,114,191,0,0,0,172,2,0,0,115,14,0,0, 0,8,2,8,8,8,13,8,10,8,7,8,10,14,8,114, 191,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0, 0,4,0,0,0,0,0,0,0,115,80,0,0,0,101,0, @@ -1228,7 +1228,7 @@ const unsigned char _Py_M__importlib_external[] = { 2,114,102,0,0,0,114,37,0,0,0,41,3,114,104,0, 0,0,114,123,0,0,0,114,37,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,6,0,0,0,114,182,0,0,0, - 30,3,0,0,115,4,0,0,0,0,3,6,1,122,19,70, + 31,3,0,0,115,4,0,0,0,0,3,6,1,122,19,70, 105,108,101,76,111,97,100,101,114,46,95,95,105,110,105,116, 95,95,99,2,0,0,0,0,0,0,0,2,0,0,0,2, 0,0,0,67,0,0,0,115,24,0,0,0,124,0,106,0, @@ -1236,7 +1236,7 @@ const unsigned char _Py_M__importlib_external[] = { 107,2,83,0,41,1,78,41,2,218,9,95,95,99,108,97, 115,115,95,95,114,115,0,0,0,41,2,114,104,0,0,0, 218,5,111,116,104,101,114,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,218,6,95,95,101,113,95,95,36,3, + 0,114,6,0,0,0,218,6,95,95,101,113,95,95,37,3, 0,0,115,4,0,0,0,0,1,12,1,122,17,70,105,108, 101,76,111,97,100,101,114,46,95,95,101,113,95,95,99,1, 0,0,0,0,0,0,0,1,0,0,0,3,0,0,0,67, @@ -1245,7 +1245,7 @@ const unsigned char _Py_M__importlib_external[] = { 3,218,4,104,97,115,104,114,102,0,0,0,114,37,0,0, 0,41,1,114,104,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,6,0,0,0,218,8,95,95,104,97,115,104,95, - 95,40,3,0,0,115,2,0,0,0,0,1,122,19,70,105, + 95,41,3,0,0,115,2,0,0,0,0,1,122,19,70,105, 108,101,76,111,97,100,101,114,46,95,95,104,97,115,104,95, 95,99,2,0,0,0,0,0,0,0,2,0,0,0,3,0, 0,0,3,0,0,0,115,16,0,0,0,116,0,116,1,124, @@ -1259,7 +1259,7 @@ const unsigned char _Py_M__importlib_external[] = { 32,32,32,41,3,218,5,115,117,112,101,114,114,207,0,0, 0,114,190,0,0,0,41,2,114,104,0,0,0,114,123,0, 0,0,41,1,114,208,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,190,0,0,0,43,3,0,0,115,2,0,0, + 0,0,0,114,190,0,0,0,44,3,0,0,115,2,0,0, 0,0,10,122,22,70,105,108,101,76,111,97,100,101,114,46, 108,111,97,100,95,109,111,100,117,108,101,99,2,0,0,0, 0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0, @@ -1270,7 +1270,7 @@ const unsigned char _Py_M__importlib_external[] = { 101,32,102,105,110,100,101,114,46,41,1,114,37,0,0,0, 41,2,114,104,0,0,0,114,123,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,6,0,0,0,114,155,0,0,0, - 55,3,0,0,115,2,0,0,0,0,3,122,23,70,105,108, + 56,3,0,0,115,2,0,0,0,0,3,122,23,70,105,108, 101,76,111,97,100,101,114,46,103,101,116,95,102,105,108,101, 110,97,109,101,99,2,0,0,0,0,0,0,0,3,0,0, 0,9,0,0,0,67,0,0,0,115,32,0,0,0,116,0, @@ -1282,7 +1282,7 @@ const unsigned char _Py_M__importlib_external[] = { 52,0,0,0,114,53,0,0,0,90,4,114,101,97,100,41, 3,114,104,0,0,0,114,37,0,0,0,114,57,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, - 197,0,0,0,60,3,0,0,115,4,0,0,0,0,2,14, + 197,0,0,0,61,3,0,0,115,4,0,0,0,0,2,14, 1,122,19,70,105,108,101,76,111,97,100,101,114,46,103,101, 116,95,100,97,116,97,78,41,12,114,109,0,0,0,114,108, 0,0,0,114,110,0,0,0,114,111,0,0,0,114,182,0, @@ -1290,7 +1290,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,190,0,0,0,114,155,0,0,0,114,197,0,0,0, 90,13,95,95,99,108,97,115,115,99,101,108,108,95,95,114, 4,0,0,0,114,4,0,0,0,41,1,114,208,0,0,0, - 114,6,0,0,0,114,207,0,0,0,25,3,0,0,115,14, + 114,6,0,0,0,114,207,0,0,0,26,3,0,0,115,14, 0,0,0,8,3,4,2,8,6,8,4,8,3,16,12,12, 5,114,207,0,0,0,99,0,0,0,0,0,0,0,0,0, 0,0,0,3,0,0,0,64,0,0,0,115,46,0,0,0, @@ -1312,7 +1312,7 @@ const unsigned char _Py_M__importlib_external[] = { 116,105,109,101,90,7,115,116,95,115,105,122,101,41,3,114, 104,0,0,0,114,37,0,0,0,114,205,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,114,194,0, - 0,0,70,3,0,0,115,4,0,0,0,0,2,8,1,122, + 0,0,71,3,0,0,115,4,0,0,0,0,2,8,1,122, 27,83,111,117,114,99,101,70,105,108,101,76,111,97,100,101, 114,46,112,97,116,104,95,115,116,97,116,115,99,4,0,0, 0,0,0,0,0,5,0,0,0,5,0,0,0,67,0,0, @@ -1322,7 +1322,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,195,0,0,0,41,5,114,104,0,0,0,114,94,0, 0,0,114,93,0,0,0,114,56,0,0,0,114,44,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,196,0,0,0,75,3,0,0,115,4,0,0,0,0,2, + 114,196,0,0,0,76,3,0,0,115,4,0,0,0,0,2, 8,1,122,32,83,111,117,114,99,101,70,105,108,101,76,111, 97,100,101,114,46,95,99,97,99,104,101,95,98,121,116,101, 99,111,100,101,105,182,1,0,0,41,1,114,217,0,0,0, @@ -1357,7 +1357,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,218,6,112,97,114,101,110,116,114,98,0,0,0,114,29, 0,0,0,114,25,0,0,0,114,198,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,114,195,0,0, - 0,80,3,0,0,115,42,0,0,0,0,2,12,1,4,2, + 0,81,3,0,0,115,42,0,0,0,0,2,12,1,4,2, 16,1,12,1,14,2,14,1,10,1,2,1,14,1,14,2, 6,1,16,3,6,1,8,1,20,1,2,1,12,1,16,1, 16,2,8,1,122,25,83,111,117,114,99,101,70,105,108,101, @@ -1365,7 +1365,7 @@ const unsigned char _Py_M__importlib_external[] = { 41,7,114,109,0,0,0,114,108,0,0,0,114,110,0,0, 0,114,111,0,0,0,114,194,0,0,0,114,196,0,0,0, 114,195,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,215,0,0,0,66,3, + 4,0,0,0,114,6,0,0,0,114,215,0,0,0,67,3, 0,0,115,8,0,0,0,8,2,4,2,8,5,8,5,114, 215,0,0,0,99,0,0,0,0,0,0,0,0,0,0,0, 0,2,0,0,0,64,0,0,0,115,32,0,0,0,101,0, @@ -1385,7 +1385,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,197,0,0,0,114,139,0,0,0,114,145,0,0,0, 41,5,114,104,0,0,0,114,123,0,0,0,114,37,0,0, 0,114,56,0,0,0,114,206,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,184,0,0,0,115, + 114,4,0,0,0,114,6,0,0,0,114,184,0,0,0,116, 3,0,0,115,8,0,0,0,0,1,10,1,10,1,14,1, 122,29,83,111,117,114,99,101,108,101,115,115,70,105,108,101, 76,111,97,100,101,114,46,103,101,116,95,99,111,100,101,99, @@ -1395,14 +1395,14 @@ const unsigned char _Py_M__importlib_external[] = { 116,104,101,114,101,32,105,115,32,110,111,32,115,111,117,114, 99,101,32,99,111,100,101,46,78,114,4,0,0,0,41,2, 114,104,0,0,0,114,123,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,199,0,0,0,121,3, + 4,0,0,0,114,6,0,0,0,114,199,0,0,0,122,3, 0,0,115,2,0,0,0,0,2,122,31,83,111,117,114,99, 101,108,101,115,115,70,105,108,101,76,111,97,100,101,114,46, 103,101,116,95,115,111,117,114,99,101,78,41,6,114,109,0, 0,0,114,108,0,0,0,114,110,0,0,0,114,111,0,0, 0,114,184,0,0,0,114,199,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, - 220,0,0,0,111,3,0,0,115,6,0,0,0,8,2,4, + 220,0,0,0,112,3,0,0,115,6,0,0,0,8,2,4, 2,8,6,114,220,0,0,0,99,0,0,0,0,0,0,0, 0,0,0,0,0,3,0,0,0,64,0,0,0,115,92,0, 0,0,101,0,90,1,100,0,90,2,100,1,90,3,100,2, @@ -1424,7 +1424,7 @@ const unsigned char _Py_M__importlib_external[] = { 78,41,2,114,102,0,0,0,114,37,0,0,0,41,3,114, 104,0,0,0,114,102,0,0,0,114,37,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,114,182,0, - 0,0,138,3,0,0,115,4,0,0,0,0,1,6,1,122, + 0,0,139,3,0,0,115,4,0,0,0,0,1,6,1,122, 28,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111, 97,100,101,114,46,95,95,105,110,105,116,95,95,99,2,0, 0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,0, @@ -1432,7 +1432,7 @@ const unsigned char _Py_M__importlib_external[] = { 2,111,22,124,0,106,1,124,1,106,1,107,2,83,0,41, 1,78,41,2,114,208,0,0,0,114,115,0,0,0,41,2, 114,104,0,0,0,114,209,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,210,0,0,0,142,3, + 4,0,0,0,114,6,0,0,0,114,210,0,0,0,143,3, 0,0,115,4,0,0,0,0,1,12,1,122,26,69,120,116, 101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114, 46,95,95,101,113,95,95,99,1,0,0,0,0,0,0,0, @@ -1441,7 +1441,7 @@ const unsigned char _Py_M__importlib_external[] = { 1,65,0,83,0,41,1,78,41,3,114,211,0,0,0,114, 102,0,0,0,114,37,0,0,0,41,1,114,104,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, - 212,0,0,0,146,3,0,0,115,2,0,0,0,0,1,122, + 212,0,0,0,147,3,0,0,115,2,0,0,0,0,1,122, 28,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111, 97,100,101,114,46,95,95,104,97,115,104,95,95,99,2,0, 0,0,0,0,0,0,3,0,0,0,4,0,0,0,67,0, @@ -1458,7 +1458,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,114,102,0,0,0,114,37,0,0,0,41,3,114, 104,0,0,0,114,162,0,0,0,114,187,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,114,183,0, - 0,0,149,3,0,0,115,10,0,0,0,0,2,4,1,10, + 0,0,150,3,0,0,115,10,0,0,0,0,2,4,1,10, 1,6,1,12,1,122,33,69,120,116,101,110,115,105,111,110, 70,105,108,101,76,111,97,100,101,114,46,99,114,101,97,116, 101,95,109,111,100,117,108,101,99,2,0,0,0,0,0,0, @@ -1475,7 +1475,7 @@ const unsigned char _Py_M__importlib_external[] = { 105,99,114,133,0,0,0,114,102,0,0,0,114,37,0,0, 0,41,2,114,104,0,0,0,114,187,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,114,188,0,0, - 0,157,3,0,0,115,6,0,0,0,0,2,14,1,6,1, + 0,158,3,0,0,115,6,0,0,0,0,2,14,1,6,1, 122,31,69,120,116,101,110,115,105,111,110,70,105,108,101,76, 111,97,100,101,114,46,101,120,101,99,95,109,111,100,117,108, 101,99,2,0,0,0,0,0,0,0,2,0,0,0,4,0, @@ -1492,7 +1492,7 @@ const unsigned char _Py_M__importlib_external[] = { 182,0,0,0,78,114,4,0,0,0,41,2,114,24,0,0, 0,218,6,115,117,102,102,105,120,41,1,218,9,102,105,108, 101,95,110,97,109,101,114,4,0,0,0,114,6,0,0,0, - 250,9,60,103,101,110,101,120,112,114,62,166,3,0,0,115, + 250,9,60,103,101,110,101,120,112,114,62,167,3,0,0,115, 2,0,0,0,4,1,122,49,69,120,116,101,110,115,105,111, 110,70,105,108,101,76,111,97,100,101,114,46,105,115,95,112, 97,99,107,97,103,101,46,60,108,111,99,97,108,115,62,46, @@ -1501,7 +1501,7 @@ const unsigned char _Py_M__importlib_external[] = { 78,83,73,79,78,95,83,85,70,70,73,88,69,83,41,2, 114,104,0,0,0,114,123,0,0,0,114,4,0,0,0,41, 1,114,223,0,0,0,114,6,0,0,0,114,157,0,0,0, - 163,3,0,0,115,6,0,0,0,0,2,14,1,12,1,122, + 164,3,0,0,115,6,0,0,0,0,2,14,1,12,1,122, 30,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111, 97,100,101,114,46,105,115,95,112,97,99,107,97,103,101,99, 2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0, @@ -1512,7 +1512,7 @@ const unsigned char _Py_M__importlib_external[] = { 101,32,97,32,99,111,100,101,32,111,98,106,101,99,116,46, 78,114,4,0,0,0,41,2,114,104,0,0,0,114,123,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,184,0,0,0,169,3,0,0,115,2,0,0,0,0, + 0,114,184,0,0,0,170,3,0,0,115,2,0,0,0,0, 2,122,28,69,120,116,101,110,115,105,111,110,70,105,108,101, 76,111,97,100,101,114,46,103,101,116,95,99,111,100,101,99, 2,0,0,0,0,0,0,0,2,0,0,0,1,0,0,0, @@ -1522,7 +1522,7 @@ const unsigned char _Py_M__importlib_external[] = { 115,32,104,97,118,101,32,110,111,32,115,111,117,114,99,101, 32,99,111,100,101,46,78,114,4,0,0,0,41,2,114,104, 0,0,0,114,123,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,199,0,0,0,173,3,0,0, + 0,0,114,6,0,0,0,114,199,0,0,0,174,3,0,0, 115,2,0,0,0,0,2,122,30,69,120,116,101,110,115,105, 111,110,70,105,108,101,76,111,97,100,101,114,46,103,101,116, 95,115,111,117,114,99,101,99,2,0,0,0,0,0,0,0, @@ -1533,7 +1533,7 @@ const unsigned char _Py_M__importlib_external[] = { 32,102,111,117,110,100,32,98,121,32,116,104,101,32,102,105, 110,100,101,114,46,41,1,114,37,0,0,0,41,2,114,104, 0,0,0,114,123,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,155,0,0,0,177,3,0,0, + 0,0,114,6,0,0,0,114,155,0,0,0,178,3,0,0, 115,2,0,0,0,0,3,122,32,69,120,116,101,110,115,105, 111,110,70,105,108,101,76,111,97,100,101,114,46,103,101,116, 95,102,105,108,101,110,97,109,101,78,41,14,114,109,0,0, @@ -1542,7 +1542,7 @@ const unsigned char _Py_M__importlib_external[] = { 183,0,0,0,114,188,0,0,0,114,157,0,0,0,114,184, 0,0,0,114,199,0,0,0,114,120,0,0,0,114,155,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,6,0,0,0,114,221,0,0,0,130,3,0,0,115, + 0,114,6,0,0,0,114,221,0,0,0,131,3,0,0,115, 20,0,0,0,8,6,4,2,8,4,8,4,8,3,8,8, 8,6,8,6,8,4,8,4,114,221,0,0,0,99,0,0, 0,0,0,0,0,0,0,0,0,0,2,0,0,0,64,0, @@ -1583,7 +1583,7 @@ const unsigned char _Py_M__importlib_external[] = { 12,95,112,97,116,104,95,102,105,110,100,101,114,41,4,114, 104,0,0,0,114,102,0,0,0,114,37,0,0,0,218,11, 112,97,116,104,95,102,105,110,100,101,114,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,182,0,0,0,190, + 114,4,0,0,0,114,6,0,0,0,114,182,0,0,0,191, 3,0,0,115,8,0,0,0,0,1,6,1,6,1,14,1, 122,23,95,78,97,109,101,115,112,97,99,101,80,97,116,104, 46,95,95,105,110,105,116,95,95,99,1,0,0,0,0,0, @@ -1601,7 +1601,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,41,4,114,104,0,0,0,114,219,0,0,0,218,3,100, 111,116,90,2,109,101,114,4,0,0,0,114,4,0,0,0, 114,6,0,0,0,218,23,95,102,105,110,100,95,112,97,114, - 101,110,116,95,112,97,116,104,95,110,97,109,101,115,196,3, + 101,110,116,95,112,97,116,104,95,110,97,109,101,115,197,3, 0,0,115,8,0,0,0,0,2,18,1,8,2,4,3,122, 38,95,78,97,109,101,115,112,97,99,101,80,97,116,104,46, 95,102,105,110,100,95,112,97,114,101,110,116,95,112,97,116, @@ -1614,7 +1614,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,90,18,112,97,114,101,110,116,95,109,111,100,117,108,101, 95,110,97,109,101,90,14,112,97,116,104,95,97,116,116,114, 95,110,97,109,101,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,230,0,0,0,206,3,0,0,115,4,0, + 6,0,0,0,114,230,0,0,0,207,3,0,0,115,4,0, 0,0,0,1,12,1,122,31,95,78,97,109,101,115,112,97, 99,101,80,97,116,104,46,95,103,101,116,95,112,97,114,101, 110,116,95,112,97,116,104,99,1,0,0,0,0,0,0,0, @@ -1630,7 +1630,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,104,0,0,0,90,11,112,97,114,101,110,116,95,112,97, 116,104,114,162,0,0,0,114,4,0,0,0,114,4,0,0, 0,114,6,0,0,0,218,12,95,114,101,99,97,108,99,117, - 108,97,116,101,210,3,0,0,115,16,0,0,0,0,2,12, + 108,97,116,101,211,3,0,0,115,16,0,0,0,0,2,12, 1,10,1,14,3,18,1,6,1,8,1,6,1,122,27,95, 78,97,109,101,115,112,97,99,101,80,97,116,104,46,95,114, 101,99,97,108,99,117,108,97,116,101,99,1,0,0,0,0, @@ -1639,7 +1639,7 @@ const unsigned char _Py_M__importlib_external[] = { 41,1,78,41,2,218,4,105,116,101,114,114,237,0,0,0, 41,1,114,104,0,0,0,114,4,0,0,0,114,4,0,0, 0,114,6,0,0,0,218,8,95,95,105,116,101,114,95,95, - 223,3,0,0,115,2,0,0,0,0,1,122,23,95,78,97, + 224,3,0,0,115,2,0,0,0,0,1,122,23,95,78,97, 109,101,115,112,97,99,101,80,97,116,104,46,95,95,105,116, 101,114,95,95,99,3,0,0,0,0,0,0,0,3,0,0, 0,3,0,0,0,67,0,0,0,115,14,0,0,0,124,2, @@ -1647,7 +1647,7 @@ const unsigned char _Py_M__importlib_external[] = { 1,114,229,0,0,0,41,3,114,104,0,0,0,218,5,105, 110,100,101,120,114,37,0,0,0,114,4,0,0,0,114,4, 0,0,0,114,6,0,0,0,218,11,95,95,115,101,116,105, - 116,101,109,95,95,226,3,0,0,115,2,0,0,0,0,1, + 116,101,109,95,95,227,3,0,0,115,2,0,0,0,0,1, 122,26,95,78,97,109,101,115,112,97,99,101,80,97,116,104, 46,95,95,115,101,116,105,116,101,109,95,95,99,1,0,0, 0,0,0,0,0,1,0,0,0,2,0,0,0,67,0,0, @@ -1655,7 +1655,7 @@ const unsigned char _Py_M__importlib_external[] = { 83,0,41,1,78,41,2,114,33,0,0,0,114,237,0,0, 0,41,1,114,104,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,6,0,0,0,218,7,95,95,108,101,110,95,95, - 229,3,0,0,115,2,0,0,0,0,1,122,22,95,78,97, + 230,3,0,0,115,2,0,0,0,0,1,122,22,95,78,97, 109,101,115,112,97,99,101,80,97,116,104,46,95,95,108,101, 110,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0, 2,0,0,0,67,0,0,0,115,12,0,0,0,100,1,106, @@ -1663,7 +1663,7 @@ const unsigned char _Py_M__importlib_external[] = { 97,109,101,115,112,97,99,101,80,97,116,104,40,123,33,114, 125,41,41,2,114,50,0,0,0,114,229,0,0,0,41,1, 114,104,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,218,8,95,95,114,101,112,114,95,95,232,3, + 6,0,0,0,218,8,95,95,114,101,112,114,95,95,233,3, 0,0,115,2,0,0,0,0,1,122,23,95,78,97,109,101, 115,112,97,99,101,80,97,116,104,46,95,95,114,101,112,114, 95,95,99,2,0,0,0,0,0,0,0,2,0,0,0,2, @@ -1671,7 +1671,7 @@ const unsigned char _Py_M__importlib_external[] = { 106,0,131,0,107,6,83,0,41,1,78,41,1,114,237,0, 0,0,41,2,114,104,0,0,0,218,4,105,116,101,109,114, 4,0,0,0,114,4,0,0,0,114,6,0,0,0,218,12, - 95,95,99,111,110,116,97,105,110,115,95,95,235,3,0,0, + 95,95,99,111,110,116,97,105,110,115,95,95,236,3,0,0, 115,2,0,0,0,0,1,122,27,95,78,97,109,101,115,112, 97,99,101,80,97,116,104,46,95,95,99,111,110,116,97,105, 110,115,95,95,99,2,0,0,0,0,0,0,0,2,0,0, @@ -1679,7 +1679,7 @@ const unsigned char _Py_M__importlib_external[] = { 106,0,106,1,124,1,131,1,1,0,100,0,83,0,41,1, 78,41,2,114,229,0,0,0,114,161,0,0,0,41,2,114, 104,0,0,0,114,244,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,161,0,0,0,238,3,0, + 0,0,0,114,6,0,0,0,114,161,0,0,0,239,3,0, 0,115,2,0,0,0,0,1,122,21,95,78,97,109,101,115, 112,97,99,101,80,97,116,104,46,97,112,112,101,110,100,78, 41,14,114,109,0,0,0,114,108,0,0,0,114,110,0,0, @@ -1688,7 +1688,7 @@ const unsigned char _Py_M__importlib_external[] = { 241,0,0,0,114,242,0,0,0,114,243,0,0,0,114,245, 0,0,0,114,161,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,114,227,0,0, - 0,183,3,0,0,115,22,0,0,0,8,5,4,2,8,6, + 0,184,3,0,0,115,22,0,0,0,8,5,4,2,8,6, 8,10,8,4,8,13,8,3,8,3,8,3,8,3,8,3, 114,227,0,0,0,99,0,0,0,0,0,0,0,0,0,0, 0,0,3,0,0,0,64,0,0,0,115,80,0,0,0,101, @@ -1704,7 +1704,7 @@ const unsigned char _Py_M__importlib_external[] = { 1,78,41,2,114,227,0,0,0,114,229,0,0,0,41,4, 114,104,0,0,0,114,102,0,0,0,114,37,0,0,0,114, 233,0,0,0,114,4,0,0,0,114,4,0,0,0,114,6, - 0,0,0,114,182,0,0,0,244,3,0,0,115,2,0,0, + 0,0,0,114,182,0,0,0,245,3,0,0,115,2,0,0, 0,0,1,122,25,95,78,97,109,101,115,112,97,99,101,76, 111,97,100,101,114,46,95,95,105,110,105,116,95,95,99,2, 0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,67, @@ -1721,21 +1721,21 @@ const unsigned char _Py_M__importlib_external[] = { 112,97,99,101,41,62,41,2,114,50,0,0,0,114,109,0, 0,0,41,2,114,168,0,0,0,114,187,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,218,11,109, - 111,100,117,108,101,95,114,101,112,114,247,3,0,0,115,2, + 111,100,117,108,101,95,114,101,112,114,248,3,0,0,115,2, 0,0,0,0,7,122,28,95,78,97,109,101,115,112,97,99, 101,76,111,97,100,101,114,46,109,111,100,117,108,101,95,114, 101,112,114,99,2,0,0,0,0,0,0,0,2,0,0,0, 1,0,0,0,67,0,0,0,115,4,0,0,0,100,1,83, 0,41,2,78,84,114,4,0,0,0,41,2,114,104,0,0, 0,114,123,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,6,0,0,0,114,157,0,0,0,0,4,0,0,115,2, + 114,6,0,0,0,114,157,0,0,0,1,4,0,0,115,2, 0,0,0,0,1,122,27,95,78,97,109,101,115,112,97,99, 101,76,111,97,100,101,114,46,105,115,95,112,97,99,107,97, 103,101,99,2,0,0,0,0,0,0,0,2,0,0,0,1, 0,0,0,67,0,0,0,115,4,0,0,0,100,1,83,0, 41,2,78,114,32,0,0,0,114,4,0,0,0,41,2,114, 104,0,0,0,114,123,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,199,0,0,0,3,4,0, + 0,0,0,114,6,0,0,0,114,199,0,0,0,4,4,0, 0,115,2,0,0,0,0,1,122,27,95,78,97,109,101,115, 112,97,99,101,76,111,97,100,101,114,46,103,101,116,95,115, 111,117,114,99,101,99,2,0,0,0,0,0,0,0,2,0, @@ -1745,7 +1745,7 @@ const unsigned char _Py_M__importlib_external[] = { 62,114,186,0,0,0,84,41,1,114,201,0,0,0,41,1, 114,202,0,0,0,41,2,114,104,0,0,0,114,123,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,184,0,0,0,6,4,0,0,115,2,0,0,0,0,1, + 114,184,0,0,0,7,4,0,0,115,2,0,0,0,0,1, 122,25,95,78,97,109,101,115,112,97,99,101,76,111,97,100, 101,114,46,103,101,116,95,99,111,100,101,99,2,0,0,0, 0,0,0,0,2,0,0,0,1,0,0,0,67,0,0,0, @@ -1754,14 +1754,14 @@ const unsigned char _Py_M__importlib_external[] = { 99,115,32,102,111,114,32,109,111,100,117,108,101,32,99,114, 101,97,116,105,111,110,46,78,114,4,0,0,0,41,2,114, 104,0,0,0,114,162,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,183,0,0,0,9,4,0, + 0,0,0,114,6,0,0,0,114,183,0,0,0,10,4,0, 0,115,0,0,0,0,122,30,95,78,97,109,101,115,112,97, 99,101,76,111,97,100,101,114,46,99,114,101,97,116,101,95, 109,111,100,117,108,101,99,2,0,0,0,0,0,0,0,2, 0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0, 100,0,83,0,41,1,78,114,4,0,0,0,41,2,114,104, 0,0,0,114,187,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,188,0,0,0,12,4,0,0, + 0,0,114,6,0,0,0,114,188,0,0,0,13,4,0,0, 115,2,0,0,0,0,1,122,28,95,78,97,109,101,115,112, 97,99,101,76,111,97,100,101,114,46,101,120,101,99,95,109, 111,100,117,108,101,99,2,0,0,0,0,0,0,0,2,0, @@ -1779,7 +1779,7 @@ const unsigned char _Py_M__importlib_external[] = { 116,104,32,123,33,114,125,41,4,114,118,0,0,0,114,133, 0,0,0,114,229,0,0,0,114,189,0,0,0,41,2,114, 104,0,0,0,114,123,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,190,0,0,0,15,4,0, + 0,0,0,114,6,0,0,0,114,190,0,0,0,16,4,0, 0,115,6,0,0,0,0,7,6,1,8,1,122,28,95,78, 97,109,101,115,112,97,99,101,76,111,97,100,101,114,46,108, 111,97,100,95,109,111,100,117,108,101,78,41,12,114,109,0, @@ -1788,7 +1788,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,199,0,0,0,114,184,0,0,0,114,183,0,0,0,114, 188,0,0,0,114,190,0,0,0,114,4,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,114,246,0, - 0,0,243,3,0,0,115,16,0,0,0,8,1,8,3,12, + 0,0,244,3,0,0,115,16,0,0,0,8,1,8,3,12, 9,8,3,8,3,8,3,8,3,8,3,114,246,0,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0, 0,64,0,0,0,115,106,0,0,0,101,0,90,1,100,0, @@ -1821,7 +1821,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,95,99,97,99,104,101,218,6,118,97,108,117,101,115,114, 112,0,0,0,114,249,0,0,0,41,2,114,168,0,0,0, 218,6,102,105,110,100,101,114,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,249,0,0,0,33,4,0,0, + 0,0,114,6,0,0,0,114,249,0,0,0,34,4,0,0, 115,6,0,0,0,0,4,16,1,10,1,122,28,80,97,116, 104,70,105,110,100,101,114,46,105,110,118,97,108,105,100,97, 116,101,95,99,97,99,104,101,115,99,2,0,0,0,0,0, @@ -1841,7 +1841,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,114,122,0,0,0,114,103,0,0,0,41,3,114,168, 0,0,0,114,37,0,0,0,90,4,104,111,111,107,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,218,11,95, - 112,97,116,104,95,104,111,111,107,115,41,4,0,0,115,16, + 112,97,116,104,95,104,111,111,107,115,42,4,0,0,115,16, 0,0,0,0,3,18,1,12,1,12,1,2,1,8,1,14, 1,12,2,122,22,80,97,116,104,70,105,110,100,101,114,46, 95,112,97,116,104,95,104,111,111,107,115,99,2,0,0,0, @@ -1873,7 +1873,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,37,0,0,0,114,252,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,6,0,0,0,218,20,95,112,97,116, 104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101, - 54,4,0,0,115,22,0,0,0,0,8,8,1,2,1,12, + 55,4,0,0,115,22,0,0,0,0,8,8,1,2,1,12, 1,14,3,6,1,2,1,14,1,14,1,10,1,16,1,122, 31,80,97,116,104,70,105,110,100,101,114,46,95,112,97,116, 104,95,105,109,112,111,114,116,101,114,95,99,97,99,104,101, @@ -1890,7 +1890,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,123,0,0,0,114,252,0,0,0,114,124,0,0,0,114, 125,0,0,0,114,162,0,0,0,114,4,0,0,0,114,4, 0,0,0,114,6,0,0,0,218,16,95,108,101,103,97,99, - 121,95,103,101,116,95,115,112,101,99,76,4,0,0,115,18, + 121,95,103,101,116,95,115,112,101,99,77,4,0,0,115,18, 0,0,0,0,4,10,1,16,2,10,1,4,1,8,1,12, 1,12,1,6,1,122,27,80,97,116,104,70,105,110,100,101, 114,46,95,108,101,103,97,99,121,95,103,101,116,95,115,112, @@ -1922,7 +1922,7 @@ const unsigned char _Py_M__importlib_external[] = { 90,5,101,110,116,114,121,114,252,0,0,0,114,162,0,0, 0,114,125,0,0,0,114,4,0,0,0,114,4,0,0,0, 114,6,0,0,0,218,9,95,103,101,116,95,115,112,101,99, - 91,4,0,0,115,40,0,0,0,0,5,4,1,10,1,14, + 92,4,0,0,115,40,0,0,0,0,5,4,1,10,1,14, 1,2,1,10,1,8,1,10,1,14,2,12,1,8,1,2, 1,10,1,4,1,6,1,8,1,8,5,14,2,12,1,6, 1,122,20,80,97,116,104,70,105,110,100,101,114,46,95,103, @@ -1949,7 +1949,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,156,0,0,0,114,227,0,0,0,41,6,114,168,0, 0,0,114,123,0,0,0,114,37,0,0,0,114,177,0,0, 0,114,162,0,0,0,114,3,1,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,178,0,0,0,123, + 114,4,0,0,0,114,6,0,0,0,114,178,0,0,0,124, 4,0,0,115,26,0,0,0,0,6,8,1,6,1,14,1, 8,1,6,1,10,1,6,1,4,3,6,1,16,1,6,2, 6,2,122,20,80,97,116,104,70,105,110,100,101,114,46,102, @@ -1971,7 +1971,7 @@ const unsigned char _Py_M__importlib_external[] = { 2,114,178,0,0,0,114,124,0,0,0,41,4,114,168,0, 0,0,114,123,0,0,0,114,37,0,0,0,114,162,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,6,0,0,0, - 114,179,0,0,0,147,4,0,0,115,8,0,0,0,0,8, + 114,179,0,0,0,148,4,0,0,115,8,0,0,0,0,8, 12,1,8,1,4,1,122,22,80,97,116,104,70,105,110,100, 101,114,46,102,105,110,100,95,109,111,100,117,108,101,41,1, 78,41,2,78,78,41,1,78,41,12,114,109,0,0,0,114, @@ -1979,7 +1979,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,114,249,0,0,0,114,254,0,0,0,114,0,1, 0,0,114,1,1,0,0,114,4,1,0,0,114,178,0,0, 0,114,179,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,248,0,0,0,29, + 114,4,0,0,0,114,6,0,0,0,114,248,0,0,0,30, 4,0,0,115,22,0,0,0,8,2,4,2,12,8,12,13, 12,22,12,15,2,1,12,31,2,1,12,23,2,1,114,248, 0,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0, @@ -2023,7 +2023,7 @@ const unsigned char _Py_M__importlib_external[] = { 14,125,1,124,1,136,0,102,2,86,0,1,0,113,2,100, 0,83,0,41,1,78,114,4,0,0,0,41,2,114,24,0, 0,0,114,222,0,0,0,41,1,114,124,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,224,0,0,0,176,4,0, + 0,0,0,114,6,0,0,0,114,224,0,0,0,177,4,0, 0,115,2,0,0,0,4,0,122,38,70,105,108,101,70,105, 110,100,101,114,46,95,95,105,110,105,116,95,95,46,60,108, 111,99,97,108,115,62,46,60,103,101,110,101,120,112,114,62, @@ -2036,7 +2036,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,37,0,0,0,218,14,108,111,97,100,101,114,95,100, 101,116,97,105,108,115,90,7,108,111,97,100,101,114,115,114, 164,0,0,0,114,4,0,0,0,41,1,114,124,0,0,0, - 114,6,0,0,0,114,182,0,0,0,170,4,0,0,115,16, + 114,6,0,0,0,114,182,0,0,0,171,4,0,0,115,16, 0,0,0,0,4,4,1,14,1,28,1,6,2,10,1,6, 1,8,1,122,19,70,105,108,101,70,105,110,100,101,114,46, 95,95,105,110,105,116,95,95,99,1,0,0,0,0,0,0, @@ -2046,7 +2046,7 @@ const unsigned char _Py_M__importlib_external[] = { 105,114,101,99,116,111,114,121,32,109,116,105,109,101,46,114, 31,0,0,0,78,114,91,0,0,0,41,1,114,7,1,0, 0,41,1,114,104,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,6,0,0,0,114,249,0,0,0,184,4,0,0, + 0,0,114,6,0,0,0,114,249,0,0,0,185,4,0,0, 115,2,0,0,0,0,2,122,28,70,105,108,101,70,105,110, 100,101,114,46,105,110,118,97,108,105,100,97,116,101,95,99, 97,99,104,101,115,99,2,0,0,0,0,0,0,0,3,0, @@ -2069,7 +2069,7 @@ const unsigned char _Py_M__importlib_external[] = { 32,32,78,41,3,114,178,0,0,0,114,124,0,0,0,114, 154,0,0,0,41,3,114,104,0,0,0,114,123,0,0,0, 114,162,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,121,0,0,0,190,4,0,0,115,8,0, + 6,0,0,0,114,121,0,0,0,191,4,0,0,115,8,0, 0,0,0,7,10,1,8,1,8,1,122,22,70,105,108,101, 70,105,110,100,101,114,46,102,105,110,100,95,108,111,97,100, 101,114,99,6,0,0,0,0,0,0,0,7,0,0,0,6, @@ -2080,7 +2080,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,114,163,0,0,0,114,123,0,0,0,114,37,0, 0,0,90,4,115,109,115,108,114,177,0,0,0,114,124,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,4,1,0,0,202,4,0,0,115,6,0,0,0,0, + 0,114,4,1,0,0,203,4,0,0,115,6,0,0,0,0, 1,10,1,8,1,122,20,70,105,108,101,70,105,110,100,101, 114,46,95,103,101,116,95,115,112,101,99,78,99,3,0,0, 0,0,0,0,0,14,0,0,0,15,0,0,0,67,0,0, @@ -2134,7 +2134,7 @@ const unsigned char _Py_M__importlib_external[] = { 116,104,114,222,0,0,0,114,163,0,0,0,90,13,105,110, 105,116,95,102,105,108,101,110,97,109,101,90,9,102,117,108, 108,95,112,97,116,104,114,162,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,6,0,0,0,114,178,0,0,0,207, + 114,4,0,0,0,114,6,0,0,0,114,178,0,0,0,208, 4,0,0,115,70,0,0,0,0,5,4,1,14,1,2,1, 24,1,14,1,10,1,10,1,8,1,6,2,6,1,6,1, 10,2,6,1,4,2,8,1,12,1,16,1,8,1,10,1, @@ -2166,7 +2166,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,146,2,113,4,83,0,114,4,0,0,0,41,1,114,92, 0,0,0,41,2,114,24,0,0,0,90,2,102,110,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,250,9,60, - 115,101,116,99,111,109,112,62,28,5,0,0,115,2,0,0, + 115,101,116,99,111,109,112,62,29,5,0,0,115,2,0,0, 0,6,0,122,41,70,105,108,101,70,105,110,100,101,114,46, 95,102,105,108,108,95,99,97,99,104,101,46,60,108,111,99, 97,108,115,62,46,60,115,101,116,99,111,109,112,62,78,41, @@ -2183,7 +2183,7 @@ const unsigned char _Py_M__importlib_external[] = { 111,110,116,101,110,116,115,114,244,0,0,0,114,102,0,0, 0,114,234,0,0,0,114,222,0,0,0,90,8,110,101,119, 95,110,97,109,101,114,4,0,0,0,114,4,0,0,0,114, - 6,0,0,0,114,12,1,0,0,255,4,0,0,115,34,0, + 6,0,0,0,114,12,1,0,0,0,5,0,0,115,34,0, 0,0,0,2,6,1,2,1,22,1,20,3,10,3,12,1, 12,7,6,1,10,1,16,1,4,1,18,2,4,1,14,1, 6,1,12,1,122,22,70,105,108,101,70,105,110,100,101,114, @@ -2211,7 +2211,7 @@ const unsigned char _Py_M__importlib_external[] = { 32,32,32,99,1,0,0,0,0,0,0,0,1,0,0,0, 4,0,0,0,19,0,0,0,115,34,0,0,0,116,0,124, 0,131,1,115,20,116,1,100,1,124,0,100,2,141,2,130, - 1,136,0,124,0,102,1,136,1,152,2,142,0,83,0,41, + 1,136,0,124,0,102,1,136,1,158,2,142,0,83,0,41, 3,122,45,80,97,116,104,32,104,111,111,107,32,102,111,114, 32,105,109,112,111,114,116,108,105,98,46,109,97,99,104,105, 110,101,114,121,46,70,105,108,101,70,105,110,100,101,114,46, @@ -2221,7 +2221,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,41,1,114,37,0,0,0,41,2,114,168,0,0, 0,114,11,1,0,0,114,4,0,0,0,114,6,0,0,0, 218,24,112,97,116,104,95,104,111,111,107,95,102,111,114,95, - 70,105,108,101,70,105,110,100,101,114,40,5,0,0,115,6, + 70,105,108,101,70,105,110,100,101,114,41,5,0,0,115,6, 0,0,0,0,2,8,1,12,1,122,54,70,105,108,101,70, 105,110,100,101,114,46,112,97,116,104,95,104,111,111,107,46, 60,108,111,99,97,108,115,62,46,112,97,116,104,95,104,111, @@ -2229,7 +2229,7 @@ const unsigned char _Py_M__importlib_external[] = { 114,114,4,0,0,0,41,3,114,168,0,0,0,114,11,1, 0,0,114,17,1,0,0,114,4,0,0,0,41,2,114,168, 0,0,0,114,11,1,0,0,114,6,0,0,0,218,9,112, - 97,116,104,95,104,111,111,107,30,5,0,0,115,4,0,0, + 97,116,104,95,104,111,111,107,31,5,0,0,115,4,0,0, 0,0,10,14,6,122,20,70,105,108,101,70,105,110,100,101, 114,46,112,97,116,104,95,104,111,111,107,99,1,0,0,0, 0,0,0,0,1,0,0,0,2,0,0,0,67,0,0,0, @@ -2237,7 +2237,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,41,2,78,122,16,70,105,108,101,70,105,110,100,101,114, 40,123,33,114,125,41,41,2,114,50,0,0,0,114,37,0, 0,0,41,1,114,104,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,6,0,0,0,114,243,0,0,0,48,5,0, + 0,0,0,114,6,0,0,0,114,243,0,0,0,49,5,0, 0,115,2,0,0,0,0,1,122,19,70,105,108,101,70,105, 110,100,101,114,46,95,95,114,101,112,114,95,95,41,1,78, 41,15,114,109,0,0,0,114,108,0,0,0,114,110,0,0, @@ -2246,7 +2246,7 @@ const unsigned char _Py_M__importlib_external[] = { 4,1,0,0,114,178,0,0,0,114,12,1,0,0,114,180, 0,0,0,114,18,1,0,0,114,243,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,6,0,0, - 0,114,5,1,0,0,161,4,0,0,115,20,0,0,0,8, + 0,114,5,1,0,0,162,4,0,0,115,20,0,0,0,8, 7,4,2,8,14,8,4,4,2,8,12,8,5,10,48,8, 31,12,18,114,5,1,0,0,99,4,0,0,0,0,0,0, 0,6,0,0,0,11,0,0,0,67,0,0,0,115,146,0, @@ -2269,7 +2269,7 @@ const unsigned char _Py_M__importlib_external[] = { 104,110,97,109,101,90,9,99,112,97,116,104,110,97,109,101, 114,124,0,0,0,114,162,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,6,0,0,0,218,14,95,102,105,120,95, - 117,112,95,109,111,100,117,108,101,54,5,0,0,115,34,0, + 117,112,95,109,111,100,117,108,101,55,5,0,0,115,34,0, 0,0,0,2,10,1,10,1,4,1,4,1,8,1,8,1, 12,2,10,1,4,1,14,1,2,1,8,1,8,1,8,1, 12,1,14,2,114,23,1,0,0,99,0,0,0,0,0,0, @@ -2289,7 +2289,7 @@ const unsigned char _Py_M__importlib_external[] = { 41,3,90,10,101,120,116,101,110,115,105,111,110,115,90,6, 115,111,117,114,99,101,90,8,98,121,116,101,99,111,100,101, 114,4,0,0,0,114,4,0,0,0,114,6,0,0,0,114, - 159,0,0,0,77,5,0,0,115,8,0,0,0,0,5,12, + 159,0,0,0,78,5,0,0,115,8,0,0,0,0,5,12, 1,8,1,8,1,114,159,0,0,0,99,1,0,0,0,0, 0,0,0,12,0,0,0,12,0,0,0,67,0,0,0,115, 188,1,0,0,124,0,97,0,116,0,106,1,97,1,116,0, @@ -2341,7 +2341,7 @@ const unsigned char _Py_M__importlib_external[] = { 1,100,0,107,2,86,0,1,0,113,2,100,1,83,0,41, 2,114,31,0,0,0,78,41,1,114,33,0,0,0,41,2, 114,24,0,0,0,114,81,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,6,0,0,0,114,224,0,0,0,113,5, + 4,0,0,0,114,6,0,0,0,114,224,0,0,0,114,5, 0,0,115,2,0,0,0,4,0,122,25,95,115,101,116,117, 112,46,60,108,111,99,97,108,115,62,46,60,103,101,110,101, 120,112,114,62,114,62,0,0,0,122,30,105,109,112,111,114, @@ -2371,7 +2371,7 @@ const unsigned char _Py_M__importlib_external[] = { 14,119,101,97,107,114,101,102,95,109,111,100,117,108,101,90, 13,119,105,110,114,101,103,95,109,111,100,117,108,101,114,4, 0,0,0,114,4,0,0,0,114,6,0,0,0,218,6,95, - 115,101,116,117,112,88,5,0,0,115,82,0,0,0,0,8, + 115,101,116,117,112,89,5,0,0,115,82,0,0,0,0,8, 4,1,6,1,6,3,10,1,10,1,10,1,12,2,10,1, 16,3,22,1,14,2,22,1,8,1,10,1,10,1,4,2, 2,1,10,1,6,1,14,1,12,2,8,1,12,1,12,1, @@ -2394,7 +2394,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,0,0,41,2,114,31,1,0,0,90,17,115,117,112,112, 111,114,116,101,100,95,108,111,97,100,101,114,115,114,4,0, 0,0,114,4,0,0,0,114,6,0,0,0,218,8,95,105, - 110,115,116,97,108,108,156,5,0,0,115,12,0,0,0,0, + 110,115,116,97,108,108,157,5,0,0,115,12,0,0,0,0, 2,8,1,6,1,20,1,10,1,12,1,114,34,1,0,0, 41,1,114,0,0,0,0,41,2,114,1,0,0,0,114,2, 0,0,0,41,1,114,49,0,0,0,41,1,78,41,3,78, @@ -2428,7 +2428,7 @@ const unsigned char _Py_M__importlib_external[] = { 0,114,6,0,0,0,218,8,60,109,111,100,117,108,101,62, 8,0,0,0,115,108,0,0,0,4,16,4,1,4,1,2, 1,6,3,8,17,8,5,8,5,8,6,8,12,8,10,8, - 9,8,5,8,7,10,22,10,121,16,1,12,2,4,1,4, + 9,8,5,8,7,10,22,10,122,16,1,12,2,4,1,4, 2,6,2,6,2,8,2,16,45,8,34,8,19,8,12,8, 12,8,28,8,17,10,55,10,12,10,10,8,14,6,3,4, 1,14,67,14,64,14,29,16,110,14,41,18,45,18,16,4, diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 6d996f0..72d2408 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -157,7 +157,7 @@ static void *opcode_targets[256] = { &&TARGET_FORMAT_VALUE, &&TARGET_BUILD_CONST_KEY_MAP, &&TARGET_BUILD_STRING, - &&_unknown_opcode, + &&TARGET_BUILD_TUPLE_UNPACK_WITH_CALL, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, -- cgit v0.12