diff options
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/Python-ast.c | 24 | ||||
| -rw-r--r-- | Python/ast.c | 8 | ||||
| -rw-r--r-- | Python/ceval.c | 24 | ||||
| -rw-r--r-- | Python/codecs.c | 27 | ||||
| -rw-r--r-- | Python/compile.c | 6 | ||||
| -rw-r--r-- | Python/formatter_unicode.c | 7 | ||||
| -rw-r--r-- | Python/graminit.c | 435 | ||||
| -rw-r--r-- | Python/importlib.h | 322 | ||||
| -rw-r--r-- | Python/marshal.c | 8 | ||||
| -rw-r--r-- | Python/opcode_targets.h | 4 | ||||
| -rw-r--r-- | Python/pythonrun.c | 13 | ||||
| -rw-r--r-- | Python/random.c | 9 | ||||
| -rw-r--r-- | Python/thread_foobar.h | 63 |
13 files changed, 549 insertions, 401 deletions
diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 44fdafc..994e721 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -349,13 +349,14 @@ static PyTypeObject *And_type; static PyTypeObject *Or_type; static PyTypeObject *operator_type; static PyObject *Add_singleton, *Sub_singleton, *Mult_singleton, -*Div_singleton, *Mod_singleton, *Pow_singleton, *LShift_singleton, -*RShift_singleton, *BitOr_singleton, *BitXor_singleton, *BitAnd_singleton, -*FloorDiv_singleton; +*MatMult_singleton, *Div_singleton, *Mod_singleton, *Pow_singleton, +*LShift_singleton, *RShift_singleton, *BitOr_singleton, *BitXor_singleton, +*BitAnd_singleton, *FloorDiv_singleton; static PyObject* ast2obj_operator(operator_ty); static PyTypeObject *Add_type; static PyTypeObject *Sub_type; static PyTypeObject *Mult_type; +static PyTypeObject *MatMult_type; static PyTypeObject *Div_type; static PyTypeObject *Mod_type; static PyTypeObject *Pow_type; @@ -970,6 +971,10 @@ static int init_types(void) if (!Mult_type) return 0; Mult_singleton = PyType_GenericNew(Mult_type, NULL, NULL); if (!Mult_singleton) return 0; + MatMult_type = make_type("MatMult", operator_type, NULL, 0); + if (!MatMult_type) return 0; + MatMult_singleton = PyType_GenericNew(MatMult_type, NULL, NULL); + if (!MatMult_singleton) return 0; Div_type = make_type("Div", operator_type, NULL, 0); if (!Div_type) return 0; Div_singleton = PyType_GenericNew(Div_type, NULL, NULL); @@ -3232,6 +3237,9 @@ PyObject* ast2obj_operator(operator_ty o) case Mult: Py_INCREF(Mult_singleton); return Mult_singleton; + case MatMult: + Py_INCREF(MatMult_singleton); + return MatMult_singleton; case Div: Py_INCREF(Div_singleton); return Div_singleton; @@ -6175,6 +6183,14 @@ obj2ast_operator(PyObject* obj, operator_ty* out, PyArena* arena) *out = Mult; return 0; } + isinstance = PyObject_IsInstance(obj, (PyObject *)MatMult_type); + if (isinstance == -1) { + return 1; + } + if (isinstance) { + *out = MatMult; + return 0; + } isinstance = PyObject_IsInstance(obj, (PyObject *)Div_type); if (isinstance == -1) { return 1; @@ -6956,6 +6972,8 @@ PyInit__ast(void) if (PyDict_SetItemString(d, "Add", (PyObject*)Add_type) < 0) return NULL; if (PyDict_SetItemString(d, "Sub", (PyObject*)Sub_type) < 0) return NULL; if (PyDict_SetItemString(d, "Mult", (PyObject*)Mult_type) < 0) return NULL; + if (PyDict_SetItemString(d, "MatMult", (PyObject*)MatMult_type) < 0) return + NULL; if (PyDict_SetItemString(d, "Div", (PyObject*)Div_type) < 0) return NULL; if (PyDict_SetItemString(d, "Mod", (PyObject*)Mod_type) < 0) return NULL; if (PyDict_SetItemString(d, "Pow", (PyObject*)Pow_type) < 0) return NULL; diff --git a/Python/ast.c b/Python/ast.c index 5668755..d6bddf1 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -825,6 +825,8 @@ get_operator(const node *n) return Sub; case STAR: return Mult; + case AT: + return MatMult; case SLASH: return Div; case DOUBLESLASH: @@ -1030,6 +1032,8 @@ ast_for_augassign(struct compiling *c, const node *n) return Pow; else return Mult; + case '@': + return MatMult; default: PyErr_Format(PyExc_SystemError, "invalid augassign: %s", STR(n)); return (operator_ty)0; @@ -2266,7 +2270,7 @@ ast_for_expr(struct compiling *c, const node *n) and_expr: shift_expr ('&' shift_expr)* shift_expr: arith_expr (('<<'|'>>') arith_expr)* arith_expr: term (('+'|'-') term)* - term: factor (('*'|'/'|'%'|'//') factor)* + term: factor (('*'|'@'|'/'|'%'|'//') factor)* factor: ('+'|'-'|'~') factor | power power: atom trailer* ('**' factor)* */ @@ -2577,7 +2581,7 @@ ast_for_expr_stmt(struct compiling *c, const node *n) /* expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | ('=' (yield_expr|testlist))*) testlist_star_expr: (test|star_expr) (',' test|star_expr)* [','] - augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' + augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=' test: ... here starts the operator precendence dance */ diff --git a/Python/ceval.c b/Python/ceval.c index 1cc3c94..e14e772 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1495,6 +1495,18 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + TARGET(BINARY_MATRIX_MULTIPLY) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_MatrixMultiply(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + TARGET(BINARY_TRUE_DIVIDE) { PyObject *divisor = POP(); PyObject *dividend = TOP(); @@ -1685,6 +1697,18 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) DISPATCH(); } + TARGET(INPLACE_MATRIX_MULTIPLY) { + PyObject *right = POP(); + PyObject *left = TOP(); + PyObject *res = PyNumber_InPlaceMatrixMultiply(left, right); + Py_DECREF(left); + Py_DECREF(right); + SET_TOP(res); + if (res == NULL) + goto error; + DISPATCH(); + } + TARGET(INPLACE_TRUE_DIVIDE) { PyObject *divisor = POP(); PyObject *dividend = TOP(); diff --git a/Python/codecs.c b/Python/codecs.c index e06d6e0..4c2ae38 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -901,6 +901,7 @@ PyObject *PyCodec_BackslashReplaceErrors(PyObject *exc) } } +#define ENC_UNKNOWN -1 #define ENC_UTF8 0 #define ENC_UTF16BE 1 #define ENC_UTF16LE 2 @@ -916,7 +917,11 @@ get_standard_encoding(const char *encoding, int *bytelength) encoding += 3; if (*encoding == '-' || *encoding == '_' ) encoding++; - if (encoding[0] == '1' && encoding[1] == '6') { + if (encoding[0] == '8' && encoding[1] == '\0') { + *bytelength = 3; + return ENC_UTF8; + } + else if (encoding[0] == '1' && encoding[1] == '6') { encoding += 2; *bytelength = 2; if (*encoding == '\0') { @@ -955,9 +960,11 @@ get_standard_encoding(const char *encoding, int *bytelength) } } } - /* utf-8 */ - *bytelength = 3; - return ENC_UTF8; + else if (strcmp(encoding, "CP_UTF8") == 0) { + *bytelength = 3; + return ENC_UTF8; + } + return ENC_UNKNOWN; } /* This handler is declared static until someone demonstrates @@ -994,6 +1001,12 @@ PyCodec_SurrogatePassErrors(PyObject *exc) } code = get_standard_encoding(encoding, &bytelength); Py_DECREF(encode); + if (code == ENC_UNKNOWN) { + /* Not supported, fail with original exception */ + PyErr_SetObject(PyExceptionInstance_Class(exc), exc); + Py_DECREF(object); + return NULL; + } res = PyBytes_FromStringAndSize(NULL, bytelength*(end-start)); if (!res) { @@ -1068,6 +1081,12 @@ PyCodec_SurrogatePassErrors(PyObject *exc) } code = get_standard_encoding(encoding, &bytelength); Py_DECREF(encode); + if (code == ENC_UNKNOWN) { + /* Not supported, fail with original exception */ + PyErr_SetObject(PyExceptionInstance_Class(exc), exc); + Py_DECREF(object); + return NULL; + } /* Try decoding a single surrogate character. If there are more, let the codec call us again. */ diff --git a/Python/compile.c b/Python/compile.c index 9978eb3..9d3646e 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -881,6 +881,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case BINARY_POWER: case BINARY_MULTIPLY: + case BINARY_MATRIX_MULTIPLY: case BINARY_MODULO: case BINARY_ADD: case BINARY_SUBTRACT: @@ -895,6 +896,7 @@ PyCompile_OpcodeStackEffect(int opcode, int oparg) case INPLACE_ADD: case INPLACE_SUBTRACT: case INPLACE_MULTIPLY: + case INPLACE_MATRIX_MULTIPLY: case INPLACE_MODULO: return -1; case STORE_SUBSCR: @@ -2625,6 +2627,8 @@ binop(struct compiler *c, operator_ty op) return BINARY_SUBTRACT; case Mult: return BINARY_MULTIPLY; + case MatMult: + return BINARY_MATRIX_MULTIPLY; case Div: return BINARY_TRUE_DIVIDE; case Mod: @@ -2689,6 +2693,8 @@ inplace_binop(struct compiler *c, operator_ty op) return INPLACE_SUBTRACT; case Mult: return INPLACE_MULTIPLY; + case MatMult: + return INPLACE_MATRIX_MULTIPLY; case Div: return INPLACE_TRUE_DIVIDE; case Mod: diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index e3a8149..056bb76 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -846,6 +846,13 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format, " format specifier 'c'"); goto done; } + /* error to request alternate format */ + if (format->alternate) { + PyErr_SetString(PyExc_ValueError, + "Alternate form (#) not allowed with integer" + " format specifier 'c'"); + goto done; + } /* taken from unicodeobject.c formatchar() */ /* Integer input truncated to a character */ diff --git a/Python/graminit.c b/Python/graminit.c index e04999b..9f79d59 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -476,7 +476,7 @@ static state states_16[3] = { {2, arcs_16_1}, {3, arcs_16_2}, }; -static arc arcs_17_0[12] = { +static arc arcs_17_0[13] = { {49, 1}, {50, 1}, {51, 1}, @@ -489,19 +489,20 @@ static arc arcs_17_0[12] = { {58, 1}, {59, 1}, {60, 1}, + {61, 1}, }; static arc arcs_17_1[1] = { {0, 1}, }; static state states_17[2] = { - {12, arcs_17_0}, + {13, arcs_17_0}, {1, arcs_17_1}, }; static arc arcs_18_0[1] = { - {61, 1}, + {62, 1}, }; static arc arcs_18_1[1] = { - {62, 2}, + {63, 2}, }; static arc arcs_18_2[1] = { {0, 2}, @@ -512,7 +513,7 @@ static state states_18[3] = { {1, arcs_18_2}, }; static arc arcs_19_0[1] = { - {63, 1}, + {64, 1}, }; static arc arcs_19_1[1] = { {0, 1}, @@ -522,11 +523,11 @@ static state states_19[2] = { {1, arcs_19_1}, }; static arc arcs_20_0[5] = { - {64, 1}, {65, 1}, {66, 1}, {67, 1}, {68, 1}, + {69, 1}, }; static arc arcs_20_1[1] = { {0, 1}, @@ -536,7 +537,7 @@ static state states_20[2] = { {1, arcs_20_1}, }; static arc arcs_21_0[1] = { - {69, 1}, + {70, 1}, }; static arc arcs_21_1[1] = { {0, 1}, @@ -546,7 +547,7 @@ static state states_21[2] = { {1, arcs_21_1}, }; static arc arcs_22_0[1] = { - {70, 1}, + {71, 1}, }; static arc arcs_22_1[1] = { {0, 1}, @@ -556,7 +557,7 @@ static state states_22[2] = { {1, arcs_22_1}, }; static arc arcs_23_0[1] = { - {71, 1}, + {72, 1}, }; static arc arcs_23_1[2] = { {9, 2}, @@ -581,14 +582,14 @@ static state states_24[2] = { {1, arcs_24_1}, }; static arc arcs_25_0[1] = { - {72, 1}, + {73, 1}, }; static arc arcs_25_1[2] = { {24, 2}, {0, 1}, }; static arc arcs_25_2[2] = { - {73, 3}, + {74, 3}, {0, 2}, }; static arc arcs_25_3[1] = { @@ -605,8 +606,8 @@ static state states_25[5] = { {1, arcs_25_4}, }; static arc arcs_26_0[2] = { - {74, 1}, {75, 1}, + {76, 1}, }; static arc arcs_26_1[1] = { {0, 1}, @@ -616,10 +617,10 @@ static state states_26[2] = { {1, arcs_26_1}, }; static arc arcs_27_0[1] = { - {76, 1}, + {77, 1}, }; static arc arcs_27_1[1] = { - {77, 2}, + {78, 2}, }; static arc arcs_27_2[1] = { {0, 2}, @@ -630,32 +631,32 @@ static state states_27[3] = { {1, arcs_27_2}, }; static arc arcs_28_0[1] = { - {73, 1}, + {74, 1}, }; static arc arcs_28_1[3] = { - {78, 2}, {79, 2}, + {80, 2}, {12, 3}, }; static arc arcs_28_2[4] = { - {78, 2}, {79, 2}, + {80, 2}, {12, 3}, - {76, 4}, + {77, 4}, }; static arc arcs_28_3[1] = { - {76, 4}, + {77, 4}, }; static arc arcs_28_4[3] = { {31, 5}, {13, 6}, - {80, 5}, + {81, 5}, }; static arc arcs_28_5[1] = { {0, 5}, }; static arc arcs_28_6[1] = { - {80, 7}, + {81, 7}, }; static arc arcs_28_7[1] = { {15, 5}, @@ -674,7 +675,7 @@ static arc arcs_29_0[1] = { {21, 1}, }; static arc arcs_29_1[2] = { - {82, 2}, + {83, 2}, {0, 1}, }; static arc arcs_29_2[1] = { @@ -693,7 +694,7 @@ static arc arcs_30_0[1] = { {12, 1}, }; static arc arcs_30_1[2] = { - {82, 2}, + {83, 2}, {0, 1}, }; static arc arcs_30_2[1] = { @@ -709,14 +710,14 @@ static state states_30[4] = { {1, arcs_30_3}, }; static arc arcs_31_0[1] = { - {81, 1}, + {82, 1}, }; static arc arcs_31_1[2] = { {30, 2}, {0, 1}, }; static arc arcs_31_2[2] = { - {81, 1}, + {82, 1}, {0, 2}, }; static state states_31[3] = { @@ -725,7 +726,7 @@ static state states_31[3] = { {2, arcs_31_2}, }; static arc arcs_32_0[1] = { - {83, 1}, + {84, 1}, }; static arc arcs_32_1[2] = { {30, 0}, @@ -739,7 +740,7 @@ static arc arcs_33_0[1] = { {21, 1}, }; static arc arcs_33_1[2] = { - {78, 0}, + {79, 0}, {0, 1}, }; static state states_33[2] = { @@ -747,7 +748,7 @@ static state states_33[2] = { {2, arcs_33_1}, }; static arc arcs_34_0[1] = { - {84, 1}, + {85, 1}, }; static arc arcs_34_1[1] = { {21, 2}, @@ -762,7 +763,7 @@ static state states_34[3] = { {2, arcs_34_2}, }; static arc arcs_35_0[1] = { - {85, 1}, + {86, 1}, }; static arc arcs_35_1[1] = { {21, 2}, @@ -777,7 +778,7 @@ static state states_35[3] = { {2, arcs_35_2}, }; static arc arcs_36_0[1] = { - {86, 1}, + {87, 1}, }; static arc arcs_36_1[1] = { {24, 2}, @@ -800,11 +801,11 @@ static state states_36[5] = { {1, arcs_36_4}, }; static arc arcs_37_0[8] = { - {87, 1}, {88, 1}, {89, 1}, {90, 1}, {91, 1}, + {92, 1}, {19, 1}, {18, 1}, {17, 1}, @@ -817,7 +818,7 @@ static state states_37[2] = { {1, arcs_37_1}, }; static arc arcs_38_0[1] = { - {92, 1}, + {93, 1}, }; static arc arcs_38_1[1] = { {24, 2}, @@ -829,8 +830,8 @@ static arc arcs_38_3[1] = { {26, 4}, }; static arc arcs_38_4[3] = { - {93, 1}, - {94, 5}, + {94, 1}, + {95, 5}, {0, 4}, }; static arc arcs_38_5[1] = { @@ -853,7 +854,7 @@ static state states_38[8] = { {1, arcs_38_7}, }; static arc arcs_39_0[1] = { - {95, 1}, + {96, 1}, }; static arc arcs_39_1[1] = { {24, 2}, @@ -865,7 +866,7 @@ static arc arcs_39_3[1] = { {26, 4}, }; static arc arcs_39_4[2] = { - {94, 5}, + {95, 5}, {0, 4}, }; static arc arcs_39_5[1] = { @@ -888,13 +889,13 @@ static state states_39[8] = { {1, arcs_39_7}, }; static arc arcs_40_0[1] = { - {96, 1}, + {97, 1}, }; static arc arcs_40_1[1] = { - {62, 2}, + {63, 2}, }; static arc arcs_40_2[1] = { - {97, 3}, + {98, 3}, }; static arc arcs_40_3[1] = { {9, 4}, @@ -906,7 +907,7 @@ static arc arcs_40_5[1] = { {26, 6}, }; static arc arcs_40_6[2] = { - {94, 7}, + {95, 7}, {0, 6}, }; static arc arcs_40_7[1] = { @@ -931,7 +932,7 @@ static state states_40[10] = { {1, arcs_40_9}, }; static arc arcs_41_0[1] = { - {98, 1}, + {99, 1}, }; static arc arcs_41_1[1] = { {25, 2}, @@ -940,8 +941,8 @@ static arc arcs_41_2[1] = { {26, 3}, }; static arc arcs_41_3[2] = { - {99, 4}, - {100, 5}, + {100, 4}, + {101, 5}, }; static arc arcs_41_4[1] = { {25, 6}, @@ -956,9 +957,9 @@ static arc arcs_41_7[1] = { {26, 9}, }; static arc arcs_41_8[4] = { - {99, 4}, - {94, 10}, - {100, 5}, + {100, 4}, + {95, 10}, + {101, 5}, {0, 8}, }; static arc arcs_41_9[1] = { @@ -971,7 +972,7 @@ static arc arcs_41_11[1] = { {26, 12}, }; static arc arcs_41_12[2] = { - {100, 5}, + {101, 5}, {0, 12}, }; static state states_41[13] = { @@ -990,10 +991,10 @@ static state states_41[13] = { {2, arcs_41_12}, }; static arc arcs_42_0[1] = { - {101, 1}, + {102, 1}, }; static arc arcs_42_1[1] = { - {102, 2}, + {103, 2}, }; static arc arcs_42_2[2] = { {30, 1}, @@ -1016,11 +1017,11 @@ static arc arcs_43_0[1] = { {24, 1}, }; static arc arcs_43_1[2] = { - {82, 2}, + {83, 2}, {0, 1}, }; static arc arcs_43_2[1] = { - {103, 3}, + {104, 3}, }; static arc arcs_43_3[1] = { {0, 3}, @@ -1032,14 +1033,14 @@ static state states_43[4] = { {1, arcs_43_3}, }; static arc arcs_44_0[1] = { - {104, 1}, + {105, 1}, }; static arc arcs_44_1[2] = { {24, 2}, {0, 1}, }; static arc arcs_44_2[2] = { - {82, 3}, + {83, 3}, {0, 2}, }; static arc arcs_44_3[1] = { @@ -1063,14 +1064,14 @@ static arc arcs_45_1[1] = { {0, 1}, }; static arc arcs_45_2[1] = { - {105, 3}, + {106, 3}, }; static arc arcs_45_3[1] = { {6, 4}, }; static arc arcs_45_4[2] = { {6, 4}, - {106, 1}, + {107, 1}, }; static state states_45[5] = { {2, arcs_45_0}, @@ -1080,21 +1081,21 @@ static state states_45[5] = { {2, arcs_45_4}, }; static arc arcs_46_0[2] = { - {107, 1}, - {108, 2}, + {108, 1}, + {109, 2}, }; static arc arcs_46_1[2] = { - {92, 3}, + {93, 3}, {0, 1}, }; static arc arcs_46_2[1] = { {0, 2}, }; static arc arcs_46_3[1] = { - {107, 4}, + {108, 4}, }; static arc arcs_46_4[1] = { - {94, 5}, + {95, 5}, }; static arc arcs_46_5[1] = { {24, 2}, @@ -1108,8 +1109,8 @@ static state states_46[6] = { {1, arcs_46_5}, }; static arc arcs_47_0[2] = { - {107, 1}, - {110, 1}, + {108, 1}, + {111, 1}, }; static arc arcs_47_1[1] = { {0, 1}, @@ -1119,7 +1120,7 @@ static state states_47[2] = { {1, arcs_47_1}, }; static arc arcs_48_0[1] = { - {111, 1}, + {112, 1}, }; static arc arcs_48_1[2] = { {33, 2}, @@ -1142,7 +1143,7 @@ static state states_48[5] = { {1, arcs_48_4}, }; static arc arcs_49_0[1] = { - {111, 1}, + {112, 1}, }; static arc arcs_49_1[2] = { {33, 2}, @@ -1152,7 +1153,7 @@ static arc arcs_49_2[1] = { {25, 3}, }; static arc arcs_49_3[1] = { - {109, 4}, + {110, 4}, }; static arc arcs_49_4[1] = { {0, 4}, @@ -1165,10 +1166,10 @@ static state states_49[5] = { {1, arcs_49_4}, }; static arc arcs_50_0[1] = { - {112, 1}, + {113, 1}, }; static arc arcs_50_1[2] = { - {113, 0}, + {114, 0}, {0, 1}, }; static state states_50[2] = { @@ -1176,10 +1177,10 @@ static state states_50[2] = { {2, arcs_50_1}, }; static arc arcs_51_0[1] = { - {114, 1}, + {115, 1}, }; static arc arcs_51_1[2] = { - {115, 0}, + {116, 0}, {0, 1}, }; static state states_51[2] = { @@ -1187,11 +1188,11 @@ static state states_51[2] = { {2, arcs_51_1}, }; static arc arcs_52_0[2] = { - {116, 1}, - {117, 2}, + {117, 1}, + {118, 2}, }; static arc arcs_52_1[1] = { - {114, 2}, + {115, 2}, }; static arc arcs_52_2[1] = { {0, 2}, @@ -1202,10 +1203,10 @@ static state states_52[3] = { {1, arcs_52_2}, }; static arc arcs_53_0[1] = { - {103, 1}, + {104, 1}, }; static arc arcs_53_1[2] = { - {118, 0}, + {119, 0}, {0, 1}, }; static state states_53[2] = { @@ -1213,25 +1214,25 @@ static state states_53[2] = { {2, arcs_53_1}, }; static arc arcs_54_0[10] = { - {119, 1}, {120, 1}, {121, 1}, {122, 1}, {123, 1}, {124, 1}, {125, 1}, - {97, 1}, - {116, 2}, - {126, 3}, + {126, 1}, + {98, 1}, + {117, 2}, + {127, 3}, }; static arc arcs_54_1[1] = { {0, 1}, }; static arc arcs_54_2[1] = { - {97, 1}, + {98, 1}, }; static arc arcs_54_3[2] = { - {116, 1}, + {117, 1}, {0, 3}, }; static state states_54[4] = { @@ -1244,7 +1245,7 @@ static arc arcs_55_0[1] = { {31, 1}, }; static arc arcs_55_1[1] = { - {103, 2}, + {104, 2}, }; static arc arcs_55_2[1] = { {0, 2}, @@ -1255,10 +1256,10 @@ static state states_55[3] = { {1, arcs_55_2}, }; static arc arcs_56_0[1] = { - {127, 1}, + {128, 1}, }; static arc arcs_56_1[2] = { - {128, 0}, + {129, 0}, {0, 1}, }; static state states_56[2] = { @@ -1266,10 +1267,10 @@ static state states_56[2] = { {2, arcs_56_1}, }; static arc arcs_57_0[1] = { - {129, 1}, + {130, 1}, }; static arc arcs_57_1[2] = { - {130, 0}, + {131, 0}, {0, 1}, }; static state states_57[2] = { @@ -1277,10 +1278,10 @@ static state states_57[2] = { {2, arcs_57_1}, }; static arc arcs_58_0[1] = { - {131, 1}, + {132, 1}, }; static arc arcs_58_1[2] = { - {132, 0}, + {133, 0}, {0, 1}, }; static state states_58[2] = { @@ -1288,11 +1289,11 @@ static state states_58[2] = { {2, arcs_58_1}, }; static arc arcs_59_0[1] = { - {133, 1}, + {134, 1}, }; static arc arcs_59_1[3] = { - {134, 0}, {135, 0}, + {136, 0}, {0, 1}, }; static state states_59[2] = { @@ -1300,11 +1301,11 @@ static state states_59[2] = { {3, arcs_59_1}, }; static arc arcs_60_0[1] = { - {136, 1}, + {137, 1}, }; static arc arcs_60_1[3] = { - {137, 0}, {138, 0}, + {139, 0}, {0, 1}, }; static state states_60[2] = { @@ -1312,27 +1313,28 @@ static state states_60[2] = { {3, arcs_60_1}, }; static arc arcs_61_0[1] = { - {139, 1}, + {140, 1}, }; -static arc arcs_61_1[5] = { +static arc arcs_61_1[6] = { {31, 0}, - {140, 0}, + {11, 0}, {141, 0}, {142, 0}, + {143, 0}, {0, 1}, }; static state states_61[2] = { {1, arcs_61_0}, - {5, arcs_61_1}, + {6, arcs_61_1}, }; static arc arcs_62_0[4] = { - {137, 1}, {138, 1}, - {143, 1}, - {144, 2}, + {139, 1}, + {144, 1}, + {145, 2}, }; static arc arcs_62_1[1] = { - {139, 2}, + {140, 2}, }; static arc arcs_62_2[1] = { {0, 2}, @@ -1343,15 +1345,15 @@ static state states_62[3] = { {1, arcs_62_2}, }; static arc arcs_63_0[1] = { - {145, 1}, + {146, 1}, }; static arc arcs_63_1[3] = { - {146, 1}, + {147, 1}, {32, 2}, {0, 1}, }; static arc arcs_63_2[1] = { - {139, 3}, + {140, 3}, }; static arc arcs_63_3[1] = { {0, 3}, @@ -1364,44 +1366,44 @@ static state states_63[4] = { }; static arc arcs_64_0[10] = { {13, 1}, - {148, 2}, - {150, 3}, + {149, 2}, + {151, 3}, {21, 4}, - {153, 4}, - {154, 5}, - {79, 4}, - {155, 4}, + {154, 4}, + {155, 5}, + {80, 4}, {156, 4}, {157, 4}, + {158, 4}, }; static arc arcs_64_1[3] = { {47, 6}, - {147, 6}, + {148, 6}, {15, 4}, }; static arc arcs_64_2[2] = { - {147, 7}, - {149, 4}, + {148, 7}, + {150, 4}, }; static arc arcs_64_3[2] = { - {151, 8}, - {152, 4}, + {152, 8}, + {153, 4}, }; static arc arcs_64_4[1] = { {0, 4}, }; static arc arcs_64_5[2] = { - {154, 5}, + {155, 5}, {0, 5}, }; static arc arcs_64_6[1] = { {15, 4}, }; static arc arcs_64_7[1] = { - {149, 4}, + {150, 4}, }; static arc arcs_64_8[1] = { - {152, 4}, + {153, 4}, }; static state states_64[9] = { {10, arcs_64_0}, @@ -1419,7 +1421,7 @@ static arc arcs_65_0[2] = { {48, 1}, }; static arc arcs_65_1[3] = { - {158, 2}, + {159, 2}, {30, 3}, {0, 1}, }; @@ -1444,15 +1446,15 @@ static state states_65[5] = { }; static arc arcs_66_0[3] = { {13, 1}, - {148, 2}, - {78, 3}, + {149, 2}, + {79, 3}, }; static arc arcs_66_1[2] = { {14, 4}, {15, 5}, }; static arc arcs_66_2[1] = { - {159, 6}, + {160, 6}, }; static arc arcs_66_3[1] = { {21, 5}, @@ -1464,7 +1466,7 @@ static arc arcs_66_5[1] = { {0, 5}, }; static arc arcs_66_6[1] = { - {149, 5}, + {150, 5}, }; static state states_66[7] = { {3, arcs_66_0}, @@ -1476,14 +1478,14 @@ static state states_66[7] = { {1, arcs_66_6}, }; static arc arcs_67_0[1] = { - {160, 1}, + {161, 1}, }; static arc arcs_67_1[2] = { {30, 2}, {0, 1}, }; static arc arcs_67_2[2] = { - {160, 1}, + {161, 1}, {0, 2}, }; static state states_67[3] = { @@ -1501,11 +1503,11 @@ static arc arcs_68_1[2] = { }; static arc arcs_68_2[3] = { {24, 3}, - {161, 4}, + {162, 4}, {0, 2}, }; static arc arcs_68_3[2] = { - {161, 4}, + {162, 4}, {0, 3}, }; static arc arcs_68_4[1] = { @@ -1534,7 +1536,7 @@ static state states_69[3] = { {1, arcs_69_2}, }; static arc arcs_70_0[2] = { - {103, 1}, + {104, 1}, {48, 1}, }; static arc arcs_70_1[2] = { @@ -1542,7 +1544,7 @@ static arc arcs_70_1[2] = { {0, 1}, }; static arc arcs_70_2[3] = { - {103, 1}, + {104, 1}, {48, 1}, {0, 2}, }; @@ -1572,7 +1574,7 @@ static arc arcs_72_0[1] = { }; static arc arcs_72_1[4] = { {25, 2}, - {158, 3}, + {159, 3}, {30, 4}, {0, 1}, }; @@ -1587,7 +1589,7 @@ static arc arcs_72_4[2] = { {0, 4}, }; static arc arcs_72_5[3] = { - {158, 3}, + {159, 3}, {30, 7}, {0, 5}, }; @@ -1623,7 +1625,7 @@ static state states_72[11] = { {2, arcs_72_10}, }; static arc arcs_73_0[1] = { - {162, 1}, + {163, 1}, }; static arc arcs_73_1[1] = { {21, 2}, @@ -1659,7 +1661,7 @@ static state states_73[8] = { {1, arcs_73_7}, }; static arc arcs_74_0[3] = { - {163, 1}, + {164, 1}, {31, 2}, {32, 3}, }; @@ -1674,7 +1676,7 @@ static arc arcs_74_3[1] = { {24, 6}, }; static arc arcs_74_4[4] = { - {163, 1}, + {164, 1}, {31, 2}, {32, 3}, {0, 4}, @@ -1687,7 +1689,7 @@ static arc arcs_74_6[1] = { {0, 6}, }; static arc arcs_74_7[2] = { - {163, 5}, + {164, 5}, {32, 3}, }; static state states_74[8] = { @@ -1704,7 +1706,7 @@ static arc arcs_75_0[1] = { {24, 1}, }; static arc arcs_75_1[3] = { - {158, 2}, + {159, 2}, {29, 3}, {0, 1}, }; @@ -1721,8 +1723,8 @@ static state states_75[4] = { {1, arcs_75_3}, }; static arc arcs_76_0[2] = { - {158, 1}, - {165, 1}, + {159, 1}, + {166, 1}, }; static arc arcs_76_1[1] = { {0, 1}, @@ -1732,19 +1734,19 @@ static state states_76[2] = { {1, arcs_76_1}, }; static arc arcs_77_0[1] = { - {96, 1}, + {97, 1}, }; static arc arcs_77_1[1] = { - {62, 2}, + {63, 2}, }; static arc arcs_77_2[1] = { - {97, 3}, + {98, 3}, }; static arc arcs_77_3[1] = { - {107, 4}, + {108, 4}, }; static arc arcs_77_4[2] = { - {164, 5}, + {165, 5}, {0, 4}, }; static arc arcs_77_5[1] = { @@ -1759,13 +1761,13 @@ static state states_77[6] = { {1, arcs_77_5}, }; static arc arcs_78_0[1] = { - {92, 1}, + {93, 1}, }; static arc arcs_78_1[1] = { - {109, 2}, + {110, 2}, }; static arc arcs_78_2[2] = { - {164, 3}, + {165, 3}, {0, 2}, }; static arc arcs_78_3[1] = { @@ -1788,10 +1790,10 @@ static state states_79[2] = { {1, arcs_79_1}, }; static arc arcs_80_0[1] = { - {167, 1}, + {168, 1}, }; static arc arcs_80_1[2] = { - {168, 2}, + {169, 2}, {0, 1}, }; static arc arcs_80_2[1] = { @@ -1803,7 +1805,7 @@ static state states_80[3] = { {1, arcs_80_2}, }; static arc arcs_81_0[2] = { - {73, 1}, + {74, 1}, {9, 2}, }; static arc arcs_81_1[1] = { @@ -1819,11 +1821,11 @@ static state states_81[3] = { }; static dfa dfas[82] = { {256, "single_input", 0, 3, states_0, - "\004\050\060\200\000\000\000\240\340\223\160\220\045\200\020\000\000\206\120\076\204\000"}, + "\004\050\060\200\000\000\000\100\301\047\341\040\113\000\041\000\000\014\241\174\010\001"}, {257, "file_input", 0, 2, states_1, - "\204\050\060\200\000\000\000\240\340\223\160\220\045\200\020\000\000\206\120\076\204\000"}, + "\204\050\060\200\000\000\000\100\301\047\341\040\113\000\041\000\000\014\241\174\010\001"}, {258, "eval_input", 0, 3, states_2, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {259, "decorator", 0, 7, states_3, "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {260, "decorators", 0, 2, states_4, @@ -1843,39 +1845,39 @@ static dfa dfas[82] = { {267, "vfpdef", 0, 2, states_11, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {268, "stmt", 0, 2, states_12, - "\000\050\060\200\000\000\000\240\340\223\160\220\045\200\020\000\000\206\120\076\204\000"}, + "\000\050\060\200\000\000\000\100\301\047\341\040\113\000\041\000\000\014\241\174\010\001"}, {269, "simple_stmt", 0, 4, states_13, - "\000\040\040\200\000\000\000\240\340\223\160\000\000\200\020\000\000\206\120\076\200\000"}, + "\000\040\040\200\000\000\000\100\301\047\341\000\000\000\041\000\000\014\241\174\000\001"}, {270, "small_stmt", 0, 2, states_14, - "\000\040\040\200\000\000\000\240\340\223\160\000\000\200\020\000\000\206\120\076\200\000"}, + "\000\040\040\200\000\000\000\100\301\047\341\000\000\000\041\000\000\014\241\174\000\001"}, {271, "expr_stmt", 0, 6, states_15, - "\000\040\040\200\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\200\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {272, "testlist_star_expr", 0, 3, states_16, - "\000\040\040\200\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\200\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {273, "augassign", 0, 2, states_17, - "\000\000\000\000\000\000\376\037\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\376\077\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {274, "del_stmt", 0, 3, states_18, - "\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {275, "pass_stmt", 0, 2, states_19, - "\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {276, "flow_stmt", 0, 2, states_20, - "\000\000\000\000\000\000\000\000\340\001\000\000\000\000\000\000\000\000\000\000\200\000"}, + "\000\000\000\000\000\000\000\000\300\003\000\000\000\000\000\000\000\000\000\000\000\001"}, {277, "break_stmt", 0, 2, states_21, - "\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {278, "continue_stmt", 0, 2, states_22, "\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {279, "return_stmt", 0, 3, states_23, + {278, "continue_stmt", 0, 2, states_22, "\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + {279, "return_stmt", 0, 3, states_23, + "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"}, {280, "yield_stmt", 0, 2, states_24, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"}, {281, "raise_stmt", 0, 5, states_25, - "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"}, {282, "import_stmt", 0, 2, states_26, - "\000\000\000\000\000\000\000\000\000\022\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\044\000\000\000\000\000\000\000\000\000\000\000\000"}, {283, "import_name", 0, 3, states_27, - "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"}, {284, "import_from", 0, 8, states_28, - "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"}, {285, "import_as_name", 0, 4, states_29, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {286, "dotted_as_name", 0, 4, states_30, @@ -1887,103 +1889,103 @@ static dfa dfas[82] = { {289, "dotted_name", 0, 2, states_33, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {290, "global_stmt", 0, 3, states_34, - "\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000"}, - {291, "nonlocal_stmt", 0, 3, states_35, "\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000"}, - {292, "assert_stmt", 0, 5, states_36, + {291, "nonlocal_stmt", 0, 3, states_35, "\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000"}, + {292, "assert_stmt", 0, 5, states_36, + "\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000"}, {293, "compound_stmt", 0, 2, states_37, - "\000\010\020\000\000\000\000\000\000\000\000\220\045\000\000\000\000\000\000\000\004\000"}, + "\000\010\020\000\000\000\000\000\000\000\000\040\113\000\000\000\000\000\000\000\010\000"}, {294, "if_stmt", 0, 8, states_38, - "\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"}, {295, "while_stmt", 0, 8, states_39, - "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"}, - {296, "for_stmt", 0, 10, states_40, "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"}, + {296, "for_stmt", 0, 10, states_40, + "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"}, {297, "try_stmt", 0, 13, states_41, - "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"}, {298, "with_stmt", 0, 5, states_42, - "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"}, {299, "with_item", 0, 4, states_43, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {300, "except_clause", 0, 5, states_44, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"}, {301, "suite", 0, 5, states_45, - "\004\040\040\200\000\000\000\240\340\223\160\000\000\200\020\000\000\206\120\076\200\000"}, + "\004\040\040\200\000\000\000\100\301\047\341\000\000\000\041\000\000\014\241\174\000\001"}, {302, "test", 0, 6, states_46, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {303, "test_nocond", 0, 2, states_47, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {304, "lambdef", 0, 5, states_48, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"}, {305, "lambdef_nocond", 0, 5, states_49, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"}, {306, "or_test", 0, 2, states_50, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\040\000\000\014\241\174\000\000"}, {307, "and_test", 0, 2, states_51, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\040\000\000\014\241\174\000\000"}, {308, "not_test", 0, 3, states_52, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\040\000\000\014\241\174\000\000"}, {309, "comparison", 0, 2, states_53, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {310, "comp_op", 0, 4, states_54, - "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\220\177\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\040\377\000\000\000\000\000\000"}, {311, "star_expr", 0, 3, states_55, "\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {312, "expr", 0, 2, states_56, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {313, "xor_expr", 0, 2, states_57, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {314, "and_expr", 0, 2, states_58, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {315, "shift_expr", 0, 2, states_59, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {316, "arith_expr", 0, 2, states_60, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {317, "term", 0, 2, states_61, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {318, "factor", 0, 3, states_62, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {319, "power", 0, 4, states_63, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\240\174\000\000"}, {320, "atom", 0, 9, states_64, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\240\174\000\000"}, {321, "testlist_comp", 0, 5, states_65, - "\000\040\040\200\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\200\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {322, "trailer", 0, 7, states_66, - "\000\040\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\020\000\000\000"}, + "\000\040\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\040\000\000\000"}, {323, "subscriptlist", 0, 3, states_67, - "\000\040\040\002\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\002\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {324, "subscript", 0, 5, states_68, - "\000\040\040\002\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\002\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {325, "sliceop", 0, 3, states_69, "\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {326, "exprlist", 0, 3, states_70, - "\000\040\040\200\000\000\000\000\000\200\000\000\000\000\000\000\000\206\120\076\000\000"}, + "\000\040\040\200\000\000\000\000\000\000\001\000\000\000\000\000\000\014\241\174\000\000"}, {327, "testlist", 0, 3, states_71, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {328, "dictorsetmaker", 0, 11, states_72, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {329, "classdef", 0, 8, states_73, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000"}, {330, "arglist", 0, 8, states_74, - "\000\040\040\200\001\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\200\001\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {331, "argument", 0, 4, states_75, - "\000\040\040\000\000\000\000\000\000\200\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\000\001\000\000\000\041\000\000\014\241\174\000\000"}, {332, "comp_iter", 0, 2, states_76, - "\000\000\000\000\000\000\000\000\000\000\000\020\001\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\040\002\000\000\000\000\000\000\000\000\000"}, {333, "comp_for", 0, 6, states_77, - "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"}, {334, "comp_if", 0, 4, states_78, - "\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"}, {335, "encoding_decl", 0, 2, states_79, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {336, "yield_expr", 0, 3, states_80, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"}, {337, "yield_arg", 0, 3, states_81, - "\000\040\040\000\000\000\000\000\000\202\000\000\000\200\020\000\000\206\120\076\000\000"}, + "\000\040\040\000\000\000\000\000\000\004\001\000\000\000\041\000\000\014\241\174\000\000"}, }; -static label labels[169] = { +static label labels[170] = { {0, "EMPTY"}, {256, 0}, {4, 0}, @@ -2007,7 +2009,7 @@ static label labels[169] = { {1, "def"}, {1, 0}, {263, 0}, - {50, 0}, + {51, 0}, {302, 0}, {11, 0}, {301, 0}, @@ -2036,6 +2038,7 @@ static label labels[169] = { {36, 0}, {37, 0}, {38, 0}, + {50, 0}, {39, 0}, {40, 0}, {41, 0}, @@ -2063,7 +2066,7 @@ static label labels[169] = { {1, "import"}, {288, 0}, {23, 0}, - {51, 0}, + {52, 0}, {287, 0}, {285, 0}, {1, "as"}, @@ -2157,6 +2160,6 @@ static label labels[169] = { grammar _PyParser_Grammar = { 82, dfas, - {169, labels}, + {170, labels}, 256 }; diff --git a/Python/importlib.h b/Python/importlib.h index ee230af..7d664de 100644 --- a/Python/importlib.h +++ b/Python/importlib.h @@ -702,7 +702,7 @@ const unsigned char _Py_M__importlib[] = { 107,119,100,115,114,4,0,0,0,114,4,0,0,0,114,5, 0,0,0,218,25,95,99,97,108,108,95,119,105,116,104,95, 102,114,97,109,101,115,95,114,101,109,111,118,101,100,57,1, - 0,0,115,2,0,0,0,0,8,114,114,0,0,0,105,238, + 0,0,115,2,0,0,0,0,8,114,114,0,0,0,105,248, 12,0,0,233,2,0,0,0,114,13,0,0,0,115,2,0, 0,0,13,10,90,11,95,95,112,121,99,97,99,104,101,95, 95,122,3,46,112,121,122,4,46,112,121,99,122,4,46,112, @@ -771,7 +771,7 @@ const unsigned char _Py_M__importlib[] = { 110,97,109,101,218,3,115,101,112,114,36,0,0,0,90,3, 116,97,103,218,8,102,105,108,101,110,97,109,101,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,218,17,99,97, - 99,104,101,95,102,114,111,109,95,115,111,117,114,99,101,181, + 99,104,101,95,102,114,111,109,95,115,111,117,114,99,101,182, 1,0,0,115,22,0,0,0,0,13,31,1,6,1,9,2, 6,1,18,1,24,1,12,1,12,1,15,1,31,1,114,132, 0,0,0,99,1,0,0,0,0,0,0,0,5,0,0,0, @@ -829,7 +829,7 @@ const unsigned char _Py_M__importlib[] = { 102,105,108,101,110,97,109,101,90,7,112,121,99,97,99,104, 101,114,129,0,0,0,114,4,0,0,0,114,4,0,0,0, 114,5,0,0,0,218,17,115,111,117,114,99,101,95,102,114, - 111,109,95,99,97,99,104,101,208,1,0,0,115,24,0,0, + 111,109,95,99,97,99,104,101,209,1,0,0,115,24,0,0, 0,0,9,18,1,15,1,18,1,18,1,12,1,3,1,24, 1,21,1,3,1,21,1,19,1,114,135,0,0,0,99,1, 0,0,0,0,0,0,0,5,0,0,0,13,0,0,0,67, @@ -865,7 +865,7 @@ const unsigned char _Py_M__importlib[] = { 115,116,114,36,0,0,0,90,9,101,120,116,101,110,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,5,0,0,0,218,15, - 95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,231, + 95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,232, 1,0,0,115,20,0,0,0,0,7,18,1,4,1,24,1, 35,1,4,1,3,1,16,1,19,1,21,1,114,142,0,0, 0,99,1,0,0,0,0,0,0,0,2,0,0,0,11,0, @@ -881,7 +881,7 @@ const unsigned char _Py_M__importlib[] = { 41,0,0,0,114,40,0,0,0,41,2,114,35,0,0,0, 114,42,0,0,0,114,4,0,0,0,114,4,0,0,0,114, 5,0,0,0,218,10,95,99,97,108,99,95,109,111,100,101, - 250,1,0,0,115,12,0,0,0,0,2,3,1,19,1,13, + 251,1,0,0,115,12,0,0,0,0,2,3,1,19,1,13, 1,11,3,10,1,114,144,0,0,0,218,9,118,101,114,98, 111,115,105,116,121,114,29,0,0,0,99,1,0,0,0,1, 0,0,0,3,0,0,0,4,0,0,0,71,0,0,0,115, @@ -902,7 +902,7 @@ const unsigned char _Py_M__importlib[] = { 115,116,100,101,114,114,41,3,218,7,109,101,115,115,97,103, 101,114,145,0,0,0,114,80,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,5,0,0,0,218,16,95,118,101,114, - 98,111,115,101,95,109,101,115,115,97,103,101,6,2,0,0, + 98,111,115,101,95,109,101,115,115,97,103,101,7,2,0,0, 115,8,0,0,0,0,2,18,1,15,1,13,1,114,152,0, 0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,4, 0,0,0,3,0,0,0,115,38,0,0,0,100,1,0,135, @@ -938,14 +938,14 @@ const unsigned char _Py_M__importlib[] = { 0,114,80,0,0,0,114,108,0,0,0,41,1,218,6,109, 101,116,104,111,100,114,4,0,0,0,114,5,0,0,0,218, 19,95,99,104,101,99,107,95,110,97,109,101,95,119,114,97, - 112,112,101,114,22,2,0,0,115,10,0,0,0,0,1,12, + 112,112,101,114,23,2,0,0,115,10,0,0,0,0,1,12, 1,12,1,15,1,25,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,97,112,112,101, 114,41,1,114,65,0,0,0,41,2,114,154,0,0,0,114, 155,0,0,0,114,4,0,0,0,41,1,114,154,0,0,0, 114,5,0,0,0,218,11,95,99,104,101,99,107,95,110,97, - 109,101,14,2,0,0,115,6,0,0,0,0,8,21,6,13, + 109,101,15,2,0,0,115,6,0,0,0,0,8,21,6,13, 1,114,156,0,0,0,99,1,0,0,0,0,0,0,0,2, 0,0,0,3,0,0,0,3,0,0,0,115,35,0,0,0, 135,0,0,102,1,0,100,1,0,100,2,0,134,0,0,125, @@ -967,7 +967,7 @@ const unsigned char _Py_M__importlib[] = { 0,218,8,102,117,108,108,110,97,109,101,41,1,218,3,102, 120,110,114,4,0,0,0,114,5,0,0,0,218,25,95,114, 101,113,117,105,114,101,115,95,98,117,105,108,116,105,110,95, - 119,114,97,112,112,101,114,34,2,0,0,115,8,0,0,0, + 119,114,97,112,112,101,114,35,2,0,0,115,8,0,0,0, 0,1,15,1,18,1,12,1,122,52,95,114,101,113,117,105, 114,101,115,95,98,117,105,108,116,105,110,46,60,108,111,99, 97,108,115,62,46,95,114,101,113,117,105,114,101,115,95,98, @@ -975,7 +975,7 @@ const unsigned char _Py_M__importlib[] = { 114,65,0,0,0,41,2,114,159,0,0,0,114,160,0,0, 0,114,4,0,0,0,41,1,114,159,0,0,0,114,5,0, 0,0,218,17,95,114,101,113,117,105,114,101,115,95,98,117, - 105,108,116,105,110,32,2,0,0,115,6,0,0,0,0,2, + 105,108,116,105,110,33,2,0,0,115,6,0,0,0,0,2, 18,5,13,1,114,161,0,0,0,99,1,0,0,0,0,0, 0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,35, 0,0,0,135,0,0,102,1,0,100,1,0,100,2,0,134, @@ -996,7 +996,7 @@ const unsigned char _Py_M__importlib[] = { 114,71,0,0,0,114,158,0,0,0,41,1,114,159,0,0, 0,114,4,0,0,0,114,5,0,0,0,218,24,95,114,101, 113,117,105,114,101,115,95,102,114,111,122,101,110,95,119,114, - 97,112,112,101,114,45,2,0,0,115,8,0,0,0,0,1, + 97,112,112,101,114,46,2,0,0,115,8,0,0,0,0,1, 15,1,18,1,12,1,122,50,95,114,101,113,117,105,114,101, 115,95,102,114,111,122,101,110,46,60,108,111,99,97,108,115, 62,46,95,114,101,113,117,105,114,101,115,95,102,114,111,122, @@ -1004,7 +1004,7 @@ const unsigned char _Py_M__importlib[] = { 0,41,2,114,159,0,0,0,114,163,0,0,0,114,4,0, 0,0,41,1,114,159,0,0,0,114,5,0,0,0,218,16, 95,114,101,113,117,105,114,101,115,95,102,114,111,122,101,110, - 43,2,0,0,115,6,0,0,0,0,2,18,5,13,1,114, + 44,2,0,0,115,6,0,0,0,0,2,18,5,13,1,114, 164,0,0,0,99,2,0,0,0,0,0,0,0,5,0,0, 0,5,0,0,0,67,0,0,0,115,87,0,0,0,124,0, 0,106,0,0,124,1,0,131,1,0,92,2,0,125,2,0, @@ -1033,7 +1033,7 @@ const unsigned char _Py_M__importlib[] = { 111,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,5, 0,0,0,218,17,95,102,105,110,100,95,109,111,100,117,108, - 101,95,115,104,105,109,54,2,0,0,115,10,0,0,0,0, + 101,95,115,104,105,109,55,2,0,0,115,10,0,0,0,0, 10,21,1,24,1,6,1,32,1,114,172,0,0,0,99,2, 0,0,0,0,0,0,0,5,0,0,0,3,0,0,0,67, 0,0,0,115,93,0,0,0,116,0,0,124,1,0,124,0, @@ -1058,7 +1058,7 @@ const unsigned char _Py_M__importlib[] = { 115,112,101,99,218,7,109,101,116,104,111,100,115,218,6,109, 111,100,117,108,101,114,4,0,0,0,114,4,0,0,0,114, 5,0,0,0,218,17,95,108,111,97,100,95,109,111,100,117, - 108,101,95,115,104,105,109,71,2,0,0,115,14,0,0,0, + 108,101,95,115,104,105,109,72,2,0,0,115,14,0,0,0, 0,6,15,1,12,1,15,1,13,1,13,1,11,2,114,180, 0,0,0,99,4,0,0,0,0,0,0,0,11,0,0,0, 19,0,0,0,67,0,0,0,115,243,1,0,0,105,0,0, @@ -1143,7 +1143,7 @@ const unsigned char _Py_M__importlib[] = { 95,109,116,105,109,101,218,11,115,111,117,114,99,101,95,115, 105,122,101,114,4,0,0,0,114,4,0,0,0,114,5,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,87,2,0, + 116,101,99,111,100,101,95,104,101,97,100,101,114,88,2,0, 0,115,76,0,0,0,0,11,6,1,12,1,13,3,6,1, 12,1,13,1,16,1,16,1,16,1,12,1,18,1,10,1, 18,1,18,1,15,1,10,1,15,1,18,1,15,1,10,1, @@ -1174,7 +1174,7 @@ const unsigned char _Py_M__importlib[] = { 5,114,53,0,0,0,114,67,0,0,0,114,140,0,0,0, 114,141,0,0,0,218,4,99,111,100,101,114,4,0,0,0, 114,4,0,0,0,114,5,0,0,0,218,17,95,99,111,109, - 112,105,108,101,95,98,121,116,101,99,111,100,101,142,2,0, + 112,105,108,101,95,98,121,116,101,99,111,100,101,143,2,0, 0,115,16,0,0,0,0,2,15,1,15,1,13,1,12,1, 19,1,4,2,18,1,114,195,0,0,0,114,84,0,0,0, 99,3,0,0,0,0,0,0,0,4,0,0,0,3,0,0, @@ -1194,7 +1194,7 @@ const unsigned char _Py_M__importlib[] = { 100,117,109,112,115,41,4,114,194,0,0,0,114,183,0,0, 0,114,189,0,0,0,114,53,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,5,0,0,0,218,17,95,99,111,100, - 101,95,116,111,95,98,121,116,101,99,111,100,101,154,2,0, + 101,95,116,111,95,98,121,116,101,99,111,100,101,155,2,0, 0,115,10,0,0,0,0,3,12,1,19,1,19,1,22,1, 114,198,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,89,0,0,0,100, @@ -1223,7 +1223,7 @@ const unsigned char _Py_M__importlib[] = { 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,5,0,0,0,218,13,100,101,99,111, - 100,101,95,115,111,117,114,99,101,164,2,0,0,115,10,0, + 100,101,95,115,111,117,114,99,101,165,2,0,0,115,10,0, 0,0,0,5,12,1,18,1,15,1,18,1,114,203,0,0, 0,99,1,0,0,0,0,0,0,0,5,0,0,0,35,0, 0,0,67,0,0,0,115,15,1,0,0,116,0,0,124,0, @@ -1257,7 +1257,7 @@ const unsigned char _Py_M__importlib[] = { 95,114,47,0,0,0,41,5,114,179,0,0,0,114,169,0, 0,0,114,177,0,0,0,114,67,0,0,0,114,131,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 218,12,95,109,111,100,117,108,101,95,114,101,112,114,178,2, + 218,12,95,109,111,100,117,108,101,95,114,101,112,114,179,2, 0,0,115,46,0,0,0,0,2,18,1,15,4,3,1,17, 1,13,1,8,1,3,1,13,1,13,1,5,2,12,1,16, 4,3,1,13,1,13,1,11,1,3,1,13,1,13,1,12, @@ -1274,7 +1274,7 @@ const unsigned char _Py_M__importlib[] = { 41,1,78,41,3,218,7,95,109,111,100,117,108,101,114,208, 0,0,0,218,5,95,115,112,101,99,41,2,114,71,0,0, 0,114,179,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,72,0,0,0,216,2,0,0,115,4, + 114,5,0,0,0,114,72,0,0,0,217,2,0,0,115,4, 0,0,0,0,1,9,1,122,26,95,105,110,115,116,97,108, 108,101,100,95,115,97,102,101,108,121,46,95,95,105,110,105, 116,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0, @@ -1285,7 +1285,7 @@ const unsigned char _Py_M__importlib[] = { 95,105,110,105,116,105,97,108,105,122,105,110,103,114,213,0, 0,0,114,7,0,0,0,114,73,0,0,0,114,67,0,0, 0,41,1,114,71,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,75,0,0,0,220,2,0,0, + 0,0,114,5,0,0,0,114,75,0,0,0,221,2,0,0, 115,4,0,0,0,0,4,12,1,122,27,95,105,110,115,116, 97,108,108,101,100,95,115,97,102,101,108,121,46,95,95,101, 110,116,101,114,95,95,99,1,0,0,0,0,0,0,0,3, @@ -1303,7 +1303,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,100,0,0,107,9,0,86,1,113,3,0,100,0,0, 83,41,1,78,114,4,0,0,0,41,2,114,22,0,0,0, 114,76,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,77,0,0,0,230,2,0,0,115,2,0, + 5,0,0,0,114,77,0,0,0,231,2,0,0,115,2,0, 0,0,6,0,122,45,95,105,110,115,116,97,108,108,101,100, 95,115,97,102,101,108,121,46,95,95,101,120,105,116,95,95, 46,60,108,111,99,97,108,115,62,46,60,103,101,110,101,120, @@ -1313,14 +1313,14 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,79,0,0,0,114,152,0,0,0,114,169,0, 0,0,114,215,0,0,0,41,3,114,71,0,0,0,114,80, 0,0,0,114,177,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,81,0,0,0,227,2,0,0, + 0,0,114,5,0,0,0,114,81,0,0,0,228,2,0,0, 115,18,0,0,0,0,1,3,1,9,1,25,1,3,1,17, 1,13,1,8,2,26,2,122,26,95,105,110,115,116,97,108, 108,101,100,95,115,97,102,101,108,121,46,95,95,101,120,105, 116,95,95,78,41,6,114,57,0,0,0,114,56,0,0,0, 114,58,0,0,0,114,72,0,0,0,114,75,0,0,0,114, 81,0,0,0,114,4,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,212,0,0,0,214,2,0, + 0,0,0,114,5,0,0,0,114,212,0,0,0,215,2,0, 0,115,6,0,0,0,12,2,12,4,12,7,114,212,0,0, 0,99,0,0,0,0,0,0,0,0,0,0,0,0,8,0, 0,0,64,0,0,0,115,172,0,0,0,101,0,0,90,1, @@ -1445,7 +1445,7 @@ const unsigned char _Py_M__importlib[] = { 99,104,101,100,41,6,114,71,0,0,0,114,67,0,0,0, 114,169,0,0,0,114,217,0,0,0,114,218,0,0,0,114, 219,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,72,0,0,0,22,3,0,0,115,14,0,0, + 0,0,0,114,72,0,0,0,23,3,0,0,115,14,0,0, 0,0,2,9,1,9,1,9,1,9,1,21,3,9,1,122, 19,77,111,100,117,108,101,83,112,101,99,46,95,95,105,110, 105,116,95,95,99,1,0,0,0,0,0,0,0,2,0,0, @@ -1470,7 +1470,7 @@ const unsigned char _Py_M__importlib[] = { 95,99,108,97,115,115,95,95,114,57,0,0,0,114,26,0, 0,0,41,2,114,71,0,0,0,114,80,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,101,0, - 0,0,34,3,0,0,115,16,0,0,0,0,1,15,1,21, + 0,0,35,3,0,0,115,16,0,0,0,0,1,15,1,21, 1,15,1,28,1,15,1,6,1,22,1,122,19,77,111,100, 117,108,101,83,112,101,99,46,95,95,114,101,112,114,95,95, 99,2,0,0,0,0,0,0,0,3,0,0,0,13,0,0, @@ -1489,7 +1489,7 @@ const unsigned char _Py_M__importlib[] = { 97,115,95,108,111,99,97,116,105,111,110,114,209,0,0,0, 41,3,114,71,0,0,0,218,5,111,116,104,101,114,218,4, 115,109,115,108,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,218,6,95,95,101,113,95,95,44,3,0,0,115, + 0,0,0,218,6,95,95,101,113,95,95,45,3,0,0,115, 20,0,0,0,0,1,9,1,3,1,18,1,18,1,18,1, 15,1,18,1,20,1,13,1,122,17,77,111,100,117,108,101, 83,112,101,99,46,95,95,101,113,95,95,99,1,0,0,0, @@ -1510,7 +1510,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,114,124,0,0,0,218,17,66,89,84,69,67,79,68, 69,95,83,85,70,70,73,88,69,83,41,2,114,71,0,0, 0,114,131,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,225,0,0,0,56,3,0,0,115,22, + 114,5,0,0,0,114,225,0,0,0,57,3,0,0,115,22, 0,0,0,0,2,15,1,24,1,9,1,21,1,3,1,19, 1,13,1,8,1,21,1,18,1,122,17,77,111,100,117,108, 101,83,112,101,99,46,99,97,99,104,101,100,99,2,0,0, @@ -1518,7 +1518,7 @@ const unsigned char _Py_M__importlib[] = { 0,115,13,0,0,0,124,1,0,124,0,0,95,0,0,100, 0,0,83,41,1,78,41,1,114,222,0,0,0,41,2,114, 71,0,0,0,114,225,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,225,0,0,0,70,3,0, + 0,0,0,114,5,0,0,0,114,225,0,0,0,71,3,0, 0,115,2,0,0,0,0,2,99,1,0,0,0,0,0,0, 0,1,0,0,0,2,0,0,0,67,0,0,0,115,46,0, 0,0,124,0,0,106,0,0,100,1,0,107,8,0,114,35, @@ -1529,14 +1529,14 @@ const unsigned char _Py_M__importlib[] = { 101,110,116,46,78,114,116,0,0,0,114,84,0,0,0,41, 3,114,220,0,0,0,114,67,0,0,0,114,32,0,0,0, 41,1,114,71,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,5,0,0,0,218,6,112,97,114,101,110,116,74,3, + 0,114,5,0,0,0,218,6,112,97,114,101,110,116,75,3, 0,0,115,6,0,0,0,0,3,15,1,20,2,122,17,77, 111,100,117,108,101,83,112,101,99,46,112,97,114,101,110,116, 99,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0, 0,67,0,0,0,115,7,0,0,0,124,0,0,106,0,0, 83,41,1,78,41,1,114,221,0,0,0,41,1,114,71,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,226,0,0,0,82,3,0,0,115,2,0,0,0,0, + 0,114,226,0,0,0,83,3,0,0,115,2,0,0,0,0, 2,122,23,77,111,100,117,108,101,83,112,101,99,46,104,97, 115,95,108,111,99,97,116,105,111,110,99,2,0,0,0,0, 0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115, @@ -1544,14 +1544,14 @@ const unsigned char _Py_M__importlib[] = { 95,1,0,100,0,0,83,41,1,78,41,2,218,4,98,111, 111,108,114,221,0,0,0,41,2,114,71,0,0,0,218,5, 118,97,108,117,101,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,226,0,0,0,86,3,0,0,115,2,0, + 5,0,0,0,114,226,0,0,0,87,3,0,0,115,2,0, 0,0,0,2,41,12,114,57,0,0,0,114,56,0,0,0, 114,58,0,0,0,114,59,0,0,0,114,72,0,0,0,114, 101,0,0,0,114,229,0,0,0,218,8,112,114,111,112,101, 114,116,121,114,225,0,0,0,218,6,115,101,116,116,101,114, 114,233,0,0,0,114,226,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,216, - 0,0,0,241,2,0,0,115,20,0,0,0,12,35,6,2, + 0,0,0,242,2,0,0,115,20,0,0,0,12,35,6,2, 15,1,15,11,12,10,12,12,18,14,21,4,18,8,18,4, 114,216,0,0,0,114,217,0,0,0,114,219,0,0,0,99, 2,0,0,0,2,0,0,0,5,0,0,0,15,0,0,0, @@ -1579,7 +1579,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,216,0,0,0,41,5,114,67,0,0,0,114,169,0, 0,0,114,217,0,0,0,114,219,0,0,0,90,6,115,101, 97,114,99,104,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,173,0,0,0,91,3,0,0,115,28,0,0, + 0,0,0,114,173,0,0,0,92,3,0,0,115,28,0,0, 0,0,2,15,1,12,1,16,1,18,1,15,1,7,2,12, 1,15,1,3,1,19,1,13,1,14,3,9,2,114,173,0, 0,0,114,169,0,0,0,114,220,0,0,0,99,2,0,0, @@ -1641,7 +1641,7 @@ const unsigned char _Py_M__importlib[] = { 12,108,111,97,100,101,114,95,99,108,97,115,115,114,127,0, 0,0,114,219,0,0,0,90,7,100,105,114,110,97,109,101, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 239,0,0,0,116,3,0,0,115,60,0,0,0,0,12,12, + 239,0,0,0,117,3,0,0,115,60,0,0,0,0,12,12, 4,6,1,15,2,3,1,19,1,13,1,11,8,21,1,9, 3,12,1,22,1,21,1,15,1,9,1,8,2,7,3,12, 2,15,1,3,1,19,1,13,1,5,2,6,1,18,2,9, @@ -1681,7 +1681,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,177,0,0,0,114,67,0,0,0,114,242,0, 0,0,114,225,0,0,0,114,220,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,218,17,95,115,112, - 101,99,95,102,114,111,109,95,109,111,100,117,108,101,180,3, + 101,99,95,102,114,111,109,95,109,111,100,117,108,101,181,3, 0,0,115,72,0,0,0,0,2,3,1,13,1,13,1,5, 2,12,1,4,2,9,1,12,1,3,1,13,1,13,2,8, 1,3,1,13,1,13,1,11,1,12,1,12,1,3,1,13, @@ -1708,7 +1708,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,95,0,0,100,0,0,83,41,1,78,41,1,114,177, 0,0,0,41,2,114,71,0,0,0,114,177,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,72, - 0,0,0,232,3,0,0,115,2,0,0,0,0,1,122,21, + 0,0,0,233,3,0,0,115,2,0,0,0,0,1,122,21, 95,83,112,101,99,77,101,116,104,111,100,115,46,95,95,105, 110,105,116,95,95,99,1,0,0,0,0,0,0,0,3,0, 0,0,3,0,0,0,67,0,0,0,115,158,0,0,0,124, @@ -1734,7 +1734,7 @@ const unsigned char _Py_M__importlib[] = { 114,169,0,0,0,114,47,0,0,0,114,226,0,0,0,41, 3,114,71,0,0,0,114,177,0,0,0,114,67,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 205,0,0,0,235,3,0,0,115,18,0,0,0,0,3,9, + 205,0,0,0,236,3,0,0,115,18,0,0,0,0,3,9, 1,30,1,15,1,15,1,13,2,22,2,9,1,19,2,122, 24,95,83,112,101,99,77,101,116,104,111,100,115,46,109,111, 100,117,108,101,95,114,101,112,114,218,9,95,111,118,101,114, @@ -1825,7 +1825,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,179,0,0,0,114,248,0,0,0,114,249,0, 0,0,114,177,0,0,0,114,169,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,218,17,105,110,105, - 116,95,109,111,100,117,108,101,95,97,116,116,114,115,251,3, + 116,95,109,111,100,117,108,101,95,97,116,116,114,115,252,3, 0,0,115,88,0,0,0,0,17,9,6,12,1,24,1,3, 1,16,1,13,1,8,3,30,1,9,1,12,2,15,1,15, 1,18,1,3,1,13,1,13,1,8,3,30,1,3,1,16, @@ -1857,7 +1857,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,68,0,0,0,114,67,0,0,0,114,254,0,0,0, 41,3,114,71,0,0,0,114,177,0,0,0,114,179,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 218,6,99,114,101,97,116,101,75,4,0,0,115,16,0,0, + 218,6,99,114,101,97,116,101,76,4,0,0,115,16,0,0, 0,0,7,9,2,18,3,21,2,6,1,12,4,18,1,13, 1,122,19,95,83,112,101,99,77,101,116,104,111,100,115,46, 99,114,101,97,116,101,99,2,0,0,0,0,0,0,0,2, @@ -1879,7 +1879,7 @@ const unsigned char _Py_M__importlib[] = { 114,169,0,0,0,218,11,101,120,101,99,95,109,111,100,117, 108,101,41,2,114,71,0,0,0,114,179,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,218,5,95, - 101,120,101,99,98,4,0,0,115,2,0,0,0,0,7,122, + 101,120,101,99,99,4,0,0,115,2,0,0,0,0,7,122, 18,95,83,112,101,99,77,101,116,104,111,100,115,46,95,101, 120,101,99,99,2,0,0,0,0,0,0,0,4,0,0,0, 11,0,0,0,67,0,0,0,115,17,1,0,0,124,0,0, @@ -1916,7 +1916,7 @@ const unsigned char _Py_M__importlib[] = { 100,117,108,101,114,2,1,0,0,41,4,114,71,0,0,0, 114,179,0,0,0,114,67,0,0,0,114,171,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,175, - 0,0,0,108,4,0,0,115,32,0,0,0,0,2,12,1, + 0,0,0,109,4,0,0,115,32,0,0,0,0,2,12,1, 10,1,13,1,24,1,15,1,21,1,18,1,18,1,27,2, 19,1,4,1,19,1,21,4,22,2,19,1,122,17,95,83, 112,101,99,77,101,116,104,111,100,115,46,101,120,101,99,99, @@ -1949,7 +1949,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,177,0,0,0,114,179,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,5,0,0,0,218,25,95,108,111,97, 100,95,98,97,99,107,119,97,114,100,95,99,111,109,112,97, - 116,105,98,108,101,132,4,0,0,115,42,0,0,0,0,4, + 116,105,98,108,101,133,4,0,0,115,42,0,0,0,0,4, 9,1,19,2,16,1,24,1,3,1,16,1,13,1,8,1, 24,1,3,4,12,1,15,1,32,1,13,1,8,1,24,1, 3,1,13,1,13,1,8,1,122,38,95,83,112,101,99,77, @@ -1976,7 +1976,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,73,0,0,0,41,2,114,71,0,0,0,114, 179,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, 0,0,0,218,14,95,108,111,97,100,95,117,110,108,111,99, - 107,101,100,162,4,0,0,115,20,0,0,0,0,2,18,2, + 107,101,100,163,4,0,0,115,20,0,0,0,0,2,18,2, 21,1,13,2,12,1,13,1,18,1,18,1,30,3,19,5, 122,27,95,83,112,101,99,77,101,116,104,111,100,115,46,95, 108,111,97,100,95,117,110,108,111,99,107,101,100,99,1,0, @@ -2001,7 +2001,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,3,1,0,0,114,103,0,0,0,114,177,0, 0,0,114,67,0,0,0,114,6,1,0,0,41,1,114,71, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,176,0,0,0,185,4,0,0,115,6,0,0,0, + 0,0,114,176,0,0,0,186,4,0,0,115,6,0,0,0, 0,9,10,1,19,1,122,17,95,83,112,101,99,77,101,116, 104,111,100,115,46,108,111,97,100,78,41,13,114,57,0,0, 0,114,56,0,0,0,114,58,0,0,0,114,59,0,0,0, @@ -2009,7 +2009,7 @@ const unsigned char _Py_M__importlib[] = { 0,1,0,0,114,2,1,0,0,114,175,0,0,0,114,5, 1,0,0,114,6,1,0,0,114,176,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,174,0,0,0,225,3,0,0,115,20,0,0,0,12, + 0,114,174,0,0,0,226,3,0,0,115,20,0,0,0,12, 3,6,4,12,3,12,16,24,80,12,23,12,10,12,24,12, 30,12,23,114,174,0,0,0,99,4,0,0,0,0,0,0, 0,6,0,0,0,11,0,0,0,67,0,0,0,115,201,0, @@ -2035,7 +2035,7 @@ const unsigned char _Py_M__importlib[] = { 90,8,112,97,116,104,110,97,109,101,90,9,99,112,97,116, 104,110,97,109,101,114,169,0,0,0,114,177,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,14, - 95,102,105,120,95,117,112,95,109,111,100,117,108,101,199,4, + 95,102,105,120,95,117,112,95,109,111,100,117,108,101,200,4, 0,0,115,34,0,0,0,0,2,15,1,15,1,6,1,6, 1,12,1,12,1,18,2,18,1,6,1,24,1,3,1,10, 1,10,1,10,1,14,1,13,2,114,9,1,0,0,99,0, @@ -2076,7 +2076,7 @@ const unsigned char _Py_M__importlib[] = { 125,32,40,98,117,105,108,116,45,105,110,41,62,41,2,114, 47,0,0,0,114,57,0,0,0,41,1,114,179,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 205,0,0,0,233,4,0,0,115,2,0,0,0,0,7,122, + 205,0,0,0,234,4,0,0,115,2,0,0,0,0,7,122, 27,66,117,105,108,116,105,110,73,109,112,111,114,116,101,114, 46,109,111,100,117,108,101,95,114,101,112,114,78,99,4,0, 0,0,0,0,0,0,4,0,0,0,5,0,0,0,67,0, @@ -2089,7 +2089,7 @@ const unsigned char _Py_M__importlib[] = { 117,105,108,116,105,110,114,173,0,0,0,41,4,218,3,99, 108,115,114,158,0,0,0,114,35,0,0,0,218,6,116,97, 114,103,101,116,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,218,9,102,105,110,100,95,115,112,101,99,242,4, + 0,0,0,218,9,102,105,110,100,95,115,112,101,99,243,4, 0,0,115,10,0,0,0,0,2,12,1,4,1,15,1,19, 2,122,25,66,117,105,108,116,105,110,73,109,112,111,114,116, 101,114,46,102,105,110,100,95,115,112,101,99,99,3,0,0, @@ -2112,7 +2112,7 @@ const unsigned char _Py_M__importlib[] = { 4,114,11,1,0,0,114,158,0,0,0,114,35,0,0,0, 114,177,0,0,0,114,4,0,0,0,114,4,0,0,0,114, 5,0,0,0,218,11,102,105,110,100,95,109,111,100,117,108, - 101,251,4,0,0,115,4,0,0,0,0,9,18,1,122,27, + 101,252,4,0,0,115,4,0,0,0,0,9,18,1,122,27, 66,117,105,108,116,105,110,73,109,112,111,114,116,101,114,46, 102,105,110,100,95,109,111,100,117,108,101,99,2,0,0,0, 0,0,0,0,3,0,0,0,10,0,0,0,67,0,0,0, @@ -2126,7 +2126,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,90,12,105,110,105,116,95,98,117,105,108,116,105,110, 114,204,0,0,0,114,250,0,0,0,41,3,114,11,1,0, 0,114,158,0,0,0,114,179,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,4,1,0,0,7, + 114,4,0,0,0,114,5,0,0,0,114,4,1,0,0,8, 5,0,0,115,10,0,0,0,0,6,13,1,24,1,9,1, 9,1,122,27,66,117,105,108,116,105,110,73,109,112,111,114, 116,101,114,46,108,111,97,100,95,109,111,100,117,108,101,99, @@ -2138,7 +2138,7 @@ const unsigned char _Py_M__importlib[] = { 101,32,111,98,106,101,99,116,115,46,78,114,4,0,0,0, 41,2,114,11,1,0,0,114,158,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,218,8,103,101,116, - 95,99,111,100,101,19,5,0,0,115,2,0,0,0,0,4, + 95,99,111,100,101,20,5,0,0,115,2,0,0,0,0,4, 122,24,66,117,105,108,116,105,110,73,109,112,111,114,116,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,115, @@ -2149,7 +2149,7 @@ const unsigned char _Py_M__importlib[] = { 111,100,101,46,78,114,4,0,0,0,41,2,114,11,1,0, 0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,0, 114,5,0,0,0,218,10,103,101,116,95,115,111,117,114,99, - 101,25,5,0,0,115,2,0,0,0,0,4,122,26,66,117, + 101,26,5,0,0,115,2,0,0,0,0,4,122,26,66,117, 105,108,116,105,110,73,109,112,111,114,116,101,114,46,103,101, 116,95,115,111,117,114,99,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, @@ -2159,7 +2159,7 @@ const unsigned char _Py_M__importlib[] = { 101,118,101,114,32,112,97,99,107,97,103,101,115,46,70,114, 4,0,0,0,41,2,114,11,1,0,0,114,158,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 219,0,0,0,31,5,0,0,115,2,0,0,0,0,4,122, + 219,0,0,0,32,5,0,0,115,2,0,0,0,0,4,122, 26,66,117,105,108,116,105,110,73,109,112,111,114,116,101,114, 46,105,115,95,112,97,99,107,97,103,101,41,14,114,57,0, 0,0,114,56,0,0,0,114,58,0,0,0,114,59,0,0, @@ -2168,7 +2168,7 @@ const unsigned char _Py_M__importlib[] = { 100,114,13,1,0,0,114,14,1,0,0,114,161,0,0,0, 114,4,1,0,0,114,15,1,0,0,114,16,1,0,0,114, 219,0,0,0,114,4,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,10,1,0,0,224,4,0, + 0,0,0,114,5,0,0,0,114,10,1,0,0,225,4,0, 0,115,28,0,0,0,12,7,6,2,18,9,3,1,21,8, 3,1,18,11,3,1,21,11,3,1,21,5,3,1,21,5, 3,1,114,10,1,0,0,99,0,0,0,0,0,0,0,0, @@ -2209,7 +2209,7 @@ const unsigned char _Py_M__importlib[] = { 33,114,125,32,40,102,114,111,122,101,110,41,62,41,2,114, 47,0,0,0,114,57,0,0,0,41,1,218,1,109,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,205,0, - 0,0,47,5,0,0,115,2,0,0,0,0,7,122,26,70, + 0,0,48,5,0,0,115,2,0,0,0,0,7,122,26,70, 114,111,122,101,110,73,109,112,111,114,116,101,114,46,109,111, 100,117,108,101,95,114,101,112,114,78,99,4,0,0,0,0, 0,0,0,4,0,0,0,5,0,0,0,67,0,0,0,115, @@ -2220,7 +2220,7 @@ const unsigned char _Py_M__importlib[] = { 114,106,0,0,0,114,162,0,0,0,114,173,0,0,0,41, 4,114,11,1,0,0,114,158,0,0,0,114,35,0,0,0, 114,12,1,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,13,1,0,0,56,5,0,0,115,6,0, + 5,0,0,0,114,13,1,0,0,57,5,0,0,115,6,0, 0,0,0,2,15,1,19,2,122,24,70,114,111,122,101,110, 73,109,112,111,114,116,101,114,46,102,105,110,100,95,115,112, 101,99,99,3,0,0,0,0,0,0,0,3,0,0,0,2, @@ -2235,7 +2235,7 @@ const unsigned char _Py_M__importlib[] = { 32,32,32,32,78,41,2,114,106,0,0,0,114,162,0,0, 0,41,3,114,11,1,0,0,114,158,0,0,0,114,35,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,14,1,0,0,63,5,0,0,115,2,0,0,0,0, + 0,114,14,1,0,0,64,5,0,0,115,2,0,0,0,0, 7,122,26,70,114,111,122,101,110,73,109,112,111,114,116,101, 114,46,102,105,110,100,95,109,111,100,117,108,101,99,1,0, 0,0,0,0,0,0,3,0,0,0,4,0,0,0,67,0, @@ -2254,7 +2254,7 @@ const unsigned char _Py_M__importlib[] = { 101,99,116,114,175,0,0,0,114,63,0,0,0,41,3,114, 179,0,0,0,114,67,0,0,0,114,194,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,1,1, - 0,0,72,5,0,0,115,12,0,0,0,0,2,12,1,15, + 0,0,73,5,0,0,115,12,0,0,0,0,2,12,1,15, 1,18,1,12,1,18,1,122,26,70,114,111,122,101,110,73, 109,112,111,114,116,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, @@ -2268,7 +2268,7 @@ const unsigned char _Py_M__importlib[] = { 97,100,46,10,10,32,32,32,32,32,32,32,32,41,1,114, 180,0,0,0,41,2,114,11,1,0,0,114,158,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 4,1,0,0,81,5,0,0,115,2,0,0,0,0,7,122, + 4,1,0,0,82,5,0,0,115,2,0,0,0,0,7,122, 26,70,114,111,122,101,110,73,109,112,111,114,116,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,2,0,0,0,67,0,0,0, @@ -2278,7 +2278,7 @@ const unsigned char _Py_M__importlib[] = { 32,116,104,101,32,102,114,111,122,101,110,32,109,111,100,117, 108,101,46,41,2,114,106,0,0,0,114,21,1,0,0,41, 2,114,11,1,0,0,114,158,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,15,1,0,0,90, + 114,4,0,0,0,114,5,0,0,0,114,15,1,0,0,91, 5,0,0,115,2,0,0,0,0,4,122,23,70,114,111,122, 101,110,73,109,112,111,114,116,101,114,46,103,101,116,95,99, 111,100,101,99,2,0,0,0,0,0,0,0,2,0,0,0, @@ -2289,7 +2289,7 @@ const unsigned char _Py_M__importlib[] = { 111,117,114,99,101,32,99,111,100,101,46,78,114,4,0,0, 0,41,2,114,11,1,0,0,114,158,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,16,1,0, - 0,96,5,0,0,115,2,0,0,0,0,4,122,25,70,114, + 0,97,5,0,0,115,2,0,0,0,0,4,122,25,70,114, 111,122,101,110,73,109,112,111,114,116,101,114,46,103,101,116, 95,115,111,117,114,99,101,99,2,0,0,0,0,0,0,0, 2,0,0,0,2,0,0,0,67,0,0,0,115,13,0,0, @@ -2300,7 +2300,7 @@ const unsigned char _Py_M__importlib[] = { 41,2,114,106,0,0,0,90,17,105,115,95,102,114,111,122, 101,110,95,112,97,99,107,97,103,101,41,2,114,11,1,0, 0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,219,0,0,0,102,5,0,0,115,2, + 114,5,0,0,0,114,219,0,0,0,103,5,0,0,115,2, 0,0,0,0,4,122,25,70,114,111,122,101,110,73,109,112, 111,114,116,101,114,46,105,115,95,112,97,99,107,97,103,101, 41,15,114,57,0,0,0,114,56,0,0,0,114,58,0,0, @@ -2309,7 +2309,7 @@ const unsigned char _Py_M__importlib[] = { 1,1,0,0,114,4,1,0,0,114,164,0,0,0,114,15, 1,0,0,114,16,1,0,0,114,219,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,19,1,0,0,38,5,0,0,115,28,0,0,0,12, + 0,114,19,1,0,0,39,5,0,0,115,28,0,0,0,12, 7,6,2,18,9,3,1,21,6,3,1,18,8,18,9,18, 9,3,1,21,5,3,1,21,5,3,1,114,19,1,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0, @@ -2347,7 +2347,7 @@ const unsigned char _Py_M__importlib[] = { 76,79,67,65,76,95,77,65,67,72,73,78,69,41,2,114, 11,1,0,0,218,3,107,101,121,114,4,0,0,0,114,4, 0,0,0,114,5,0,0,0,218,14,95,111,112,101,110,95, - 114,101,103,105,115,116,114,121,121,5,0,0,115,8,0,0, + 114,101,103,105,115,116,114,121,122,5,0,0,115,8,0,0, 0,0,2,3,1,23,1,13,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,105,115,116,114,121,99, @@ -2374,7 +2374,7 @@ const unsigned char _Py_M__importlib[] = { 24,1,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,5, 0,0,0,218,16,95,115,101,97,114,99,104,95,114,101,103, - 105,115,116,114,121,128,5,0,0,115,22,0,0,0,0,2, + 105,115,116,114,121,129,5,0,0,115,22,0,0,0,0,2, 9,1,12,2,9,1,15,1,22,1,3,1,18,1,28,1, 13,1,9,1,122,38,87,105,110,100,111,119,115,82,101,103, 105,115,116,114,121,70,105,110,100,101,114,46,95,115,101,97, @@ -2396,7 +2396,7 @@ const unsigned char _Py_M__importlib[] = { 8,114,11,1,0,0,114,158,0,0,0,114,35,0,0,0, 114,12,1,0,0,114,30,1,0,0,114,169,0,0,0,114, 127,0,0,0,114,177,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,13,1,0,0,143,5,0, + 0,0,0,114,5,0,0,0,114,13,1,0,0,144,5,0, 0,115,24,0,0,0,0,2,15,1,12,1,4,1,3,1, 14,1,13,1,9,1,22,1,21,1,21,1,9,1,122,31, 87,105,110,100,111,119,115,82,101,103,105,115,116,114,121,70, @@ -2415,7 +2415,7 @@ const unsigned char _Py_M__importlib[] = { 32,32,32,32,32,32,78,41,2,114,13,1,0,0,114,169, 0,0,0,41,4,114,11,1,0,0,114,158,0,0,0,114, 35,0,0,0,114,177,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,14,1,0,0,158,5,0, + 0,0,0,114,5,0,0,0,114,14,1,0,0,159,5,0, 0,115,8,0,0,0,0,7,18,1,12,1,7,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,108, @@ -2424,7 +2424,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,26,1,0,0,114,18,1,0,0,114,25,1,0,0, 114,31,1,0,0,114,13,1,0,0,114,14,1,0,0,114, 4,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,22,1,0,0,109,5,0,0,115,20,0,0, + 0,0,0,114,22,1,0,0,110,5,0,0,115,20,0,0, 0,12,2,6,3,6,3,6,2,6,2,18,7,18,15,3, 1,21,14,3,1,114,22,1,0,0,99,0,0,0,0,0, 0,0,0,0,0,0,0,2,0,0,0,64,0,0,0,115, @@ -2460,7 +2460,7 @@ const unsigned char _Py_M__importlib[] = { 41,5,114,71,0,0,0,114,158,0,0,0,114,131,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,5,0,0,0,114,219,0,0,0,177, + 114,4,0,0,0,114,5,0,0,0,114,219,0,0,0,178, 5,0,0,115,8,0,0,0,0,3,25,1,22,1,19,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, @@ -2479,14 +2479,14 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,47,0,0,0,114,114,0,0,0,114,175,0, 0,0,114,63,0,0,0,41,3,114,71,0,0,0,114,179, 0,0,0,114,194,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,1,1,0,0,185,5,0,0, + 0,0,114,5,0,0,0,114,1,1,0,0,186,5,0,0, 115,10,0,0,0,0,2,18,1,12,1,3,1,24,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,78,41,8,114,57,0, 0,0,114,56,0,0,0,114,58,0,0,0,114,59,0,0, 0,114,219,0,0,0,114,1,1,0,0,114,180,0,0,0, 114,4,1,0,0,114,4,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,5,0,0,0,114,32,1,0,0,172,5, + 4,0,0,0,114,5,0,0,0,114,32,1,0,0,173,5, 0,0,115,8,0,0,0,12,3,6,2,12,8,12,8,114, 32,1,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, @@ -2514,7 +2514,7 @@ const unsigned char _Py_M__importlib[] = { 32,32,78,41,1,218,7,73,79,69,114,114,111,114,41,2, 114,71,0,0,0,114,35,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,10,112,97,116,104,95, - 109,116,105,109,101,198,5,0,0,115,2,0,0,0,0,6, + 109,116,105,109,101,199,5,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,20, @@ -2549,7 +2549,7 @@ const unsigned char _Py_M__importlib[] = { 32,32,32,32,32,32,32,32,114,183,0,0,0,41,1,114, 35,1,0,0,41,2,114,71,0,0,0,114,35,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,218, - 10,112,97,116,104,95,115,116,97,116,115,206,5,0,0,115, + 10,112,97,116,104,95,115,116,97,116,115,207,5,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, @@ -2573,7 +2573,7 @@ const unsigned char _Py_M__importlib[] = { 71,0,0,0,114,141,0,0,0,90,10,99,97,99,104,101, 95,112,97,116,104,114,53,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,15,95,99,97,99,104, - 101,95,98,121,116,101,99,111,100,101,219,5,0,0,115,2, + 101,95,98,121,116,101,99,111,100,101,220,5,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,0, @@ -2590,7 +2590,7 @@ const unsigned char _Py_M__importlib[] = { 115,46,10,32,32,32,32,32,32,32,32,78,114,4,0,0, 0,41,3,114,71,0,0,0,114,35,0,0,0,114,53,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,37,1,0,0,229,5,0,0,115,0,0,0,0,122, + 0,114,37,1,0,0,230,5,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,105,0,0,0, @@ -2611,7 +2611,7 @@ const unsigned char _Py_M__importlib[] = { 97,114,40,0,0,0,114,153,0,0,0,114,203,0,0,0, 41,5,114,71,0,0,0,114,158,0,0,0,114,35,0,0, 0,114,201,0,0,0,218,3,101,120,99,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,16,1,0,0,236, + 114,4,0,0,0,114,5,0,0,0,114,16,1,0,0,237, 5,0,0,115,14,0,0,0,0,2,15,1,3,1,19,1, 18,1,9,1,31,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,218, @@ -2633,7 +2633,7 @@ const unsigned char _Py_M__importlib[] = { 99,111,109,112,105,108,101,41,4,114,71,0,0,0,114,53, 0,0,0,114,35,0,0,0,114,41,1,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,218,14,115,111, - 117,114,99,101,95,116,111,95,99,111,100,101,246,5,0,0, + 117,114,99,101,95,116,111,95,99,111,100,101,247,5,0,0, 115,4,0,0,0,0,5,18,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,0,0,10, @@ -2694,7 +2694,7 @@ const unsigned char _Py_M__importlib[] = { 115,116,114,53,0,0,0,218,10,98,121,116,101,115,95,100, 97,116,97,114,201,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, - 5,0,0,0,114,15,1,0,0,254,5,0,0,115,78,0, + 5,0,0,0,114,15,1,0,0,255,5,0,0,115,78,0, 0,0,0,7,15,1,6,1,3,1,16,1,13,1,11,2, 3,1,19,1,13,1,5,2,16,1,3,1,19,1,13,1, 5,2,3,1,9,1,12,1,13,1,19,1,5,2,9,1, @@ -2706,7 +2706,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,0,114,36,1,0,0,114,38,1,0,0,114,37,1, 0,0,114,16,1,0,0,114,44,1,0,0,114,15,1,0, 0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,33,1,0,0,196,5,0,0,115,14, + 114,5,0,0,0,114,33,1,0,0,197,5,0,0,115,14, 0,0,0,12,2,12,8,12,13,12,10,12,7,12,10,18, 8,114,33,1,0,0,99,0,0,0,0,0,0,0,0,0, 0,0,0,4,0,0,0,0,0,0,0,115,112,0,0,0, @@ -2735,7 +2735,7 @@ const unsigned char _Py_M__importlib[] = { 105,110,100,101,114,46,78,41,2,114,67,0,0,0,114,35, 0,0,0,41,3,114,71,0,0,0,114,158,0,0,0,114, 35,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,72,0,0,0,55,6,0,0,115,4,0,0, + 0,0,0,114,72,0,0,0,56,6,0,0,115,4,0,0, 0,0,3,9,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,3,0,0,0,67,0,0,0,115, @@ -2744,7 +2744,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,107,2,0,83,41,1,78,41,2,114,224,0,0,0, 114,63,0,0,0,41,2,114,71,0,0,0,114,227,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 114,229,0,0,0,61,6,0,0,115,4,0,0,0,0,1, + 114,229,0,0,0,62,6,0,0,115,4,0,0,0,0,1, 18,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,0,0,0,115,26,0,0,0,116, @@ -2752,7 +2752,7 @@ const unsigned char _Py_M__importlib[] = { 0,106,2,0,131,1,0,65,83,41,1,78,41,3,218,4, 104,97,115,104,114,67,0,0,0,114,35,0,0,0,41,1, 114,71,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,218,8,95,95,104,97,115,104,95,95,65,6, + 5,0,0,0,218,8,95,95,104,97,115,104,95,95,66,6, 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, @@ -2767,7 +2767,7 @@ const unsigned char _Py_M__importlib[] = { 32,32,32,32,32,32,41,3,218,5,115,117,112,101,114,114, 48,1,0,0,114,4,1,0,0,41,2,114,71,0,0,0, 114,158,0,0,0,41,1,114,224,0,0,0,114,4,0,0, - 0,114,5,0,0,0,114,4,1,0,0,68,6,0,0,115, + 0,114,5,0,0,0,114,4,1,0,0,69,6,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, @@ -2778,7 +2778,7 @@ const unsigned char _Py_M__importlib[] = { 121,32,116,104,101,32,102,105,110,100,101,114,46,41,1,114, 35,0,0,0,41,2,114,71,0,0,0,114,158,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 238,0,0,0,80,6,0,0,115,2,0,0,0,0,3,122, + 238,0,0,0,81,6,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,8,0,0,0,67,0,0,0,115,41,0, @@ -2791,14 +2791,14 @@ const unsigned char _Py_M__importlib[] = { 0,114,50,0,0,0,90,4,114,101,97,100,41,3,114,71, 0,0,0,114,35,0,0,0,114,54,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,39,1,0, - 0,85,6,0,0,115,4,0,0,0,0,2,21,1,122,19, + 0,86,6,0,0,115,4,0,0,0,0,2,21,1,122,19, 70,105,108,101,76,111,97,100,101,114,46,103,101,116,95,100, 97,116,97,41,11,114,57,0,0,0,114,56,0,0,0,114, 58,0,0,0,114,59,0,0,0,114,72,0,0,0,114,229, 0,0,0,114,50,1,0,0,114,156,0,0,0,114,4,1, 0,0,114,238,0,0,0,114,39,1,0,0,114,4,0,0, 0,114,4,0,0,0,41,1,114,224,0,0,0,114,5,0, - 0,0,114,48,1,0,0,50,6,0,0,115,14,0,0,0, + 0,0,114,48,1,0,0,51,6,0,0,115,14,0,0,0, 12,3,6,2,12,6,12,4,12,3,24,12,18,5,114,48, 1,0,0,99,0,0,0,0,0,0,0,0,0,0,0,0, 4,0,0,0,64,0,0,0,115,64,0,0,0,101,0,0, @@ -2821,7 +2821,7 @@ const unsigned char _Py_M__importlib[] = { 109,101,90,7,115,116,95,115,105,122,101,41,3,114,71,0, 0,0,114,35,0,0,0,114,46,1,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,36,1,0,0, - 95,6,0,0,115,4,0,0,0,0,2,12,1,122,27,83, + 96,6,0,0,115,4,0,0,0,0,2,12,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,0,115, @@ -2831,7 +2831,7 @@ const unsigned char _Py_M__importlib[] = { 41,2,114,144,0,0,0,114,37,1,0,0,41,5,114,71, 0,0,0,114,141,0,0,0,114,140,0,0,0,114,53,0, 0,0,114,42,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,5,0,0,0,114,38,1,0,0,100,6,0,0,115, + 0,114,5,0,0,0,114,38,1,0,0,101,6,0,0,115, 4,0,0,0,0,2,12,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,114,54,1,0,0,105, @@ -2869,7 +2869,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,53,0,0,0,114,54,1,0,0,114,233,0,0,0, 114,131,0,0,0,114,27,0,0,0,114,23,0,0,0,114, 40,1,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,37,1,0,0,105,6,0,0,115,38,0,0, + 0,0,0,114,37,1,0,0,106,6,0,0,115,38,0,0, 0,0,2,18,1,6,2,22,1,18,1,17,2,19,1,15, 1,3,1,17,1,13,2,7,1,18,3,16,1,27,1,3, 1,16,1,17,1,18,2,122,25,83,111,117,114,99,101,70, @@ -2878,7 +2878,7 @@ const unsigned char _Py_M__importlib[] = { 58,0,0,0,114,59,0,0,0,114,36,1,0,0,114,38, 1,0,0,114,37,1,0,0,114,4,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,8,1,0, - 0,91,6,0,0,115,8,0,0,0,12,2,6,2,12,5, + 0,92,6,0,0,115,8,0,0,0,12,2,6,2,12,5, 12,5,114,8,1,0,0,99,0,0,0,0,0,0,0,0, 0,0,0,0,2,0,0,0,64,0,0,0,115,46,0,0, 0,101,0,0,90,1,0,100,0,0,90,2,0,100,1,0, @@ -2899,7 +2899,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,41,5,114,71,0,0,0,114,158,0,0,0,114, 35,0,0,0,114,53,0,0,0,114,47,1,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,15,1, - 0,0,138,6,0,0,115,8,0,0,0,0,1,15,1,15, + 0,0,139,6,0,0,115,8,0,0,0,0,1,15,1,15, 1,24,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,2,0,0,0,0,0,0,0,2,0,0,0,1, @@ -2909,13 +2909,13 @@ const unsigned char _Py_M__importlib[] = { 111,117,114,99,101,32,99,111,100,101,46,78,114,4,0,0, 0,41,2,114,71,0,0,0,114,158,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,16,1,0, - 0,144,6,0,0,115,2,0,0,0,0,2,122,31,83,111, + 0,145,6,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,57,0,0,0,114,56,0,0,0,114,58,0,0,0,114, 59,0,0,0,114,15,1,0,0,114,16,1,0,0,114,4, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,7,1,0,0,134,6,0,0,115,6,0,0,0, + 0,0,114,7,1,0,0,135,6,0,0,115,6,0,0,0, 12,2,6,2,12,6,114,7,1,0,0,99,0,0,0,0, 0,0,0,0,0,0,0,0,3,0,0,0,64,0,0,0, 115,130,0,0,0,101,0,0,90,1,0,100,0,0,90,2, @@ -2940,7 +2940,7 @@ const unsigned char _Py_M__importlib[] = { 41,2,114,67,0,0,0,114,35,0,0,0,41,3,114,71, 0,0,0,114,67,0,0,0,114,35,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,72,0,0, - 0,161,6,0,0,115,4,0,0,0,0,1,9,1,122,28, + 0,162,6,0,0,115,4,0,0,0,0,1,9,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,3,0,0,0,67,0,0, @@ -2949,7 +2949,7 @@ const unsigned char _Py_M__importlib[] = { 0,106,1,0,107,2,0,83,41,1,78,41,2,114,224,0, 0,0,114,63,0,0,0,41,2,114,71,0,0,0,114,227, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,229,0,0,0,165,6,0,0,115,4,0,0,0, + 0,0,114,229,0,0,0,166,6,0,0,115,4,0,0,0, 0,1,18,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,1,0,0,0,3,0,0, @@ -2958,7 +2958,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,65,83,41,1,78,41,3,114,49,1,0,0,114,67, 0,0,0,114,35,0,0,0,41,1,114,71,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,50, - 1,0,0,169,6,0,0,115,2,0,0,0,0,1,122,28, + 1,0,0,170,6,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,4,0,0,0,11,0,0,0,67,0,0, @@ -2986,7 +2986,7 @@ const unsigned char _Py_M__importlib[] = { 57,0,0,0,114,250,0,0,0,114,32,0,0,0,41,4, 114,71,0,0,0,114,158,0,0,0,114,179,0,0,0,114, 219,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,4,1,0,0,172,6,0,0,115,24,0,0, + 0,0,0,114,4,1,0,0,173,6,0,0,115,24,0,0, 0,0,5,13,1,9,1,21,1,16,1,15,1,22,1,28, 1,9,1,12,1,6,1,28,1,122,31,69,120,116,101,110, 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,108, @@ -3005,7 +3005,7 @@ const unsigned char _Py_M__importlib[] = { 113,3,0,100,1,0,83,41,2,114,72,0,0,0,78,114, 4,0,0,0,41,2,114,22,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,5,0,0,0,114,77,0,0,0,193, + 114,4,0,0,0,114,5,0,0,0,114,77,0,0,0,194, 6,0,0,115,2,0,0,0,6,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, @@ -3014,7 +3014,7 @@ const unsigned char _Py_M__importlib[] = { 69,88,84,69,78,83,73,79,78,95,83,85,70,70,73,88, 69,83,41,2,114,71,0,0,0,114,158,0,0,0,114,4, 0,0,0,41,1,114,58,1,0,0,114,5,0,0,0,114, - 219,0,0,0,190,6,0,0,115,6,0,0,0,0,2,19, + 219,0,0,0,191,6,0,0,115,6,0,0,0,0,2,19, 1,18,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, @@ -3025,7 +3025,7 @@ const unsigned char _Py_M__importlib[] = { 114,101,97,116,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,71,0,0, 0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,15,1,0,0,196,6,0,0,115,2, + 114,5,0,0,0,114,15,1,0,0,197,6,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, @@ -3036,7 +3036,7 @@ const unsigned char _Py_M__importlib[] = { 117,114,99,101,32,99,111,100,101,46,78,114,4,0,0,0, 41,2,114,71,0,0,0,114,158,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,16,1,0,0, - 200,6,0,0,115,2,0,0,0,0,2,122,30,69,120,116, + 201,6,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,2,0,0,0,1,0,0,0,67,0,0,0, @@ -3047,7 +3047,7 @@ const unsigned char _Py_M__importlib[] = { 104,101,32,102,105,110,100,101,114,46,41,1,114,35,0,0, 0,41,2,114,71,0,0,0,114,158,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,238,0,0, - 0,204,6,0,0,115,2,0,0,0,0,3,122,32,69,120, + 0,205,6,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, 13,114,57,0,0,0,114,56,0,0,0,114,58,0,0,0, @@ -3055,7 +3055,7 @@ const unsigned char _Py_M__importlib[] = { 50,1,0,0,114,156,0,0,0,114,4,1,0,0,114,219, 0,0,0,114,15,1,0,0,114,16,1,0,0,114,238,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,5,0,0,0,114,56,1,0,0,153,6,0,0,115, + 0,114,5,0,0,0,114,56,1,0,0,154,6,0,0,115, 18,0,0,0,12,6,6,2,12,4,12,4,12,3,18,18, 12,6,12,4,12,4,114,56,1,0,0,99,0,0,0,0, 0,0,0,0,0,0,0,0,2,0,0,0,64,0,0,0, @@ -3099,7 +3099,7 @@ const unsigned char _Py_M__importlib[] = { 116,104,95,102,105,110,100,101,114,41,4,114,71,0,0,0, 114,67,0,0,0,114,35,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,5,0,0,0,114,72,0,0,0,217,6,0,0,115, + 0,114,5,0,0,0,114,72,0,0,0,218,6,0,0,115, 8,0,0,0,0,1,9,1,9,1,21,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,0,0,4,0, @@ -3118,7 +3118,7 @@ const unsigned char _Py_M__importlib[] = { 233,0,0,0,218,3,100,111,116,114,94,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,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,223,6,0,0,115,8,0,0,0,0, + 95,110,97,109,101,115,224,6,0,0,115,8,0,0,0,0, 2,27,1,12,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,104,95,110,97,109,101,115,99, @@ -3131,7 +3131,7 @@ const unsigned char _Py_M__importlib[] = { 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,5,0, - 0,0,114,61,1,0,0,233,6,0,0,115,4,0,0,0, + 0,0,114,61,1,0,0,234,6,0,0,115,4,0,0,0, 0,1,18,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,3,0, @@ -3150,7 +3150,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,90,11,112,97,114,101,110,116,95,112,97,116,104,114, 177,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, 0,0,0,218,12,95,114,101,99,97,108,99,117,108,97,116, - 101,237,6,0,0,115,16,0,0,0,0,2,18,1,15,1, + 101,238,6,0,0,115,16,0,0,0,0,2,18,1,15,1, 21,3,27,1,9,1,18,1,12,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,0,0,0, @@ -3159,14 +3159,14 @@ const unsigned char _Py_M__importlib[] = { 83,41,1,78,41,2,218,4,105,116,101,114,114,67,1,0, 0,41,1,114,71,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,5,0,0,0,218,8,95,95,105,116,101,114,95, - 95,250,6,0,0,115,2,0,0,0,0,1,122,23,95,78, + 95,251,6,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,1,0,0,0,0,0,0,0,1,0, 0,0,2,0,0,0,67,0,0,0,115,16,0,0,0,116, 0,0,124,0,0,106,1,0,131,0,0,131,1,0,83,41, 1,78,41,2,114,31,0,0,0,114,67,1,0,0,41,1, 114,71,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,218,7,95,95,108,101,110,95,95,253,6,0, + 5,0,0,0,218,7,95,95,108,101,110,95,95,254,6,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, @@ -3175,7 +3175,7 @@ const unsigned char _Py_M__importlib[] = { 78,97,109,101,115,112,97,99,101,80,97,116,104,40,123,33, 114,125,41,41,2,114,47,0,0,0,114,253,0,0,0,41, 1,114,71,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,101,0,0,0,0,7,0,0,115,2, + 114,5,0,0,0,114,101,0,0,0,1,7,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,0,0,0,67, @@ -3183,7 +3183,7 @@ const unsigned char _Py_M__importlib[] = { 0,131,0,0,107,6,0,83,41,1,78,41,1,114,67,1, 0,0,41,2,114,71,0,0,0,218,4,105,116,101,109,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,12, - 95,95,99,111,110,116,97,105,110,115,95,95,3,7,0,0, + 95,95,99,111,110,116,97,105,110,115,95,95,4,7,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, @@ -3192,7 +3192,7 @@ const unsigned char _Py_M__importlib[] = { 0,83,41,1,78,41,2,114,253,0,0,0,114,223,0,0, 0,41,2,114,71,0,0,0,114,71,1,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,223,0,0, - 0,6,7,0,0,115,2,0,0,0,0,1,122,21,95,78, + 0,7,7,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,13,114,57,0,0,0,114,56,0,0,0, 114,58,0,0,0,114,59,0,0,0,114,72,0,0,0,114, @@ -3200,7 +3200,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,0,114,70,1,0,0,114,101,0,0,0,114,72,1, 0,0,114,223,0,0,0,114,4,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,60,1,0,0, - 210,6,0,0,115,20,0,0,0,12,5,6,2,12,6,12, + 211,6,0,0,115,20,0,0,0,12,5,6,2,12,6,12, 10,12,4,12,13,12,3,12,3,12,3,12,3,114,60,1, 0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,3, 0,0,0,64,0,0,0,115,106,0,0,0,101,0,0,90, @@ -3217,7 +3217,7 @@ const unsigned char _Py_M__importlib[] = { 41,1,78,41,2,114,60,1,0,0,114,253,0,0,0,41, 4,114,71,0,0,0,114,67,0,0,0,114,35,0,0,0, 114,64,1,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,72,0,0,0,12,7,0,0,115,2,0, + 5,0,0,0,114,72,0,0,0,13,7,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, @@ -3234,21 +3234,21 @@ const unsigned char _Py_M__importlib[] = { 110,97,109,101,115,112,97,99,101,41,62,41,2,114,47,0, 0,0,114,57,0,0,0,41,2,114,11,1,0,0,114,179, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,205,0,0,0,15,7,0,0,115,2,0,0,0, + 0,0,114,205,0,0,0,16,7,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,0,83,41,2, 78,84,114,4,0,0,0,41,2,114,71,0,0,0,114,158, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,219,0,0,0,24,7,0,0,115,2,0,0,0, + 0,0,114,219,0,0,0,25,7,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,0,83,41,2,78, 114,30,0,0,0,114,4,0,0,0,41,2,114,71,0,0, 0,114,158,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,16,1,0,0,27,7,0,0,115,2, + 114,5,0,0,0,114,16,1,0,0,28,7,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,0,0,6, @@ -3258,14 +3258,14 @@ const unsigned char _Py_M__importlib[] = { 105,110,103,62,114,175,0,0,0,114,42,1,0,0,84,41, 1,114,43,1,0,0,41,2,114,71,0,0,0,114,158,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,15,1,0,0,30,7,0,0,115,2,0,0,0,0, + 0,114,15,1,0,0,31,7,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,115,4,0,0,0,100,0,0,83,41,1,78,114,4,0, 0,0,41,2,114,71,0,0,0,114,179,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,1,1, - 0,0,33,7,0,0,115,2,0,0,0,0,1,122,28,95, + 0,0,34,7,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,0,0,3,0,0,0,67,0,0,0, @@ -3283,14 +3283,14 @@ const unsigned char _Py_M__importlib[] = { 41,3,114,152,0,0,0,114,253,0,0,0,114,180,0,0, 0,41,2,114,71,0,0,0,114,158,0,0,0,114,4,0, 0,0,114,4,0,0,0,114,5,0,0,0,114,4,1,0, - 0,36,7,0,0,115,4,0,0,0,0,7,16,1,122,28, + 0,37,7,0,0,115,4,0,0,0,0,7,16,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,11,114, 57,0,0,0,114,56,0,0,0,114,58,0,0,0,114,72, 0,0,0,114,18,1,0,0,114,205,0,0,0,114,219,0, 0,0,114,16,1,0,0,114,15,1,0,0,114,1,1,0, 0,114,4,1,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,251,0,0,0,11, + 114,4,0,0,0,114,5,0,0,0,114,251,0,0,0,12, 7,0,0,115,14,0,0,0,12,1,12,3,18,9,12,3, 12,3,12,3,12,3,114,251,0,0,0,99,0,0,0,0, 0,0,0,0,0,0,0,0,5,0,0,0,64,0,0,0, @@ -3328,7 +3328,7 @@ const unsigned char _Py_M__importlib[] = { 101,114,95,99,97,99,104,101,218,6,118,97,108,117,101,115, 114,60,0,0,0,114,74,1,0,0,41,2,114,11,1,0, 0,218,6,102,105,110,100,101,114,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,74,1,0,0,53,7,0, + 0,0,0,114,5,0,0,0,114,74,1,0,0,54,7,0, 0,115,6,0,0,0,0,4,22,1,15,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, @@ -3353,7 +3353,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,153,0,0,0,41,3,114,11,1,0,0,114, 35,0,0,0,90,4,104,111,111,107,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,11,95,112,97,116,104, - 95,104,111,111,107,115,61,7,0,0,115,16,0,0,0,0, + 95,104,111,111,107,115,62,7,0,0,115,16,0,0,0,0, 7,9,1,19,1,16,1,3,1,14,1,13,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,0,0,0,0, @@ -3383,7 +3383,7 @@ const unsigned char _Py_M__importlib[] = { 11,1,0,0,114,35,0,0,0,114,77,1,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,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,78,7,0,0,115,16,0,0,0,0,8,12,1, + 99,104,101,79,7,0,0,115,16,0,0,0,0,8,12,1, 15,1,3,1,17,1,13,1,15,1,18,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,99,3,0, @@ -3402,7 +3402,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,169,0,0,0,114,170,0,0,0,114,177,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,218, 16,95,108,101,103,97,99,121,95,103,101,116,95,115,112,101, - 99,95,7,0,0,115,18,0,0,0,0,4,15,1,24,2, + 99,96,7,0,0,115,18,0,0,0,0,4,15,1,24,2, 15,1,6,1,12,1,13,1,15,1,9,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,101,99,78,99,4,0,0,0,0, @@ -3438,7 +3438,7 @@ const unsigned char _Py_M__importlib[] = { 112,97,116,104,90,5,101,110,116,114,121,114,77,1,0,0, 114,177,0,0,0,114,170,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,9,95,103,101,116,95, - 115,112,101,99,110,7,0,0,115,40,0,0,0,0,5,6, + 115,112,101,99,111,7,0,0,115,40,0,0,0,0,5,6, 1,13,1,21,1,6,1,15,1,12,1,15,1,21,2,18, 1,12,1,6,1,15,1,4,1,9,1,12,1,15,5,20, 2,15,1,9,1,122,20,80,97,116,104,70,105,110,100,101, @@ -3465,7 +3465,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,217,0,0,0,114,60,1,0,0,41,6,114,11,1, 0,0,114,158,0,0,0,114,35,0,0,0,114,12,1,0, 0,114,177,0,0,0,114,84,1,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,13,1,0,0,142, + 114,4,0,0,0,114,5,0,0,0,114,13,1,0,0,143, 7,0,0,115,26,0,0,0,0,4,12,1,12,1,21,1, 12,1,4,1,15,1,9,1,6,3,9,1,24,1,4,2, 7,2,122,20,80,97,116,104,70,105,110,100,101,114,46,102, @@ -3488,7 +3488,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,169,0,0,0,41,4,114,11,1,0,0,114,158,0, 0,0,114,35,0,0,0,114,177,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,14,1,0,0, - 164,7,0,0,115,8,0,0,0,0,8,18,1,12,1,4, + 165,7,0,0,115,8,0,0,0,0,8,18,1,12,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,12,114,57,0,0,0, 114,56,0,0,0,114,58,0,0,0,114,59,0,0,0,114, @@ -3496,7 +3496,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,0,114,81,1,0,0,114,85,1,0,0,114,13,1, 0,0,114,14,1,0,0,114,4,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,73,1,0,0, - 49,7,0,0,115,22,0,0,0,12,2,6,2,18,8,18, + 50,7,0,0,115,22,0,0,0,12,2,6,2,18,8,18, 17,18,17,18,15,3,1,18,31,3,1,21,21,3,1,114, 73,1,0,0,99,0,0,0,0,0,0,0,0,0,0,0, 0,3,0,0,0,64,0,0,0,115,133,0,0,0,101,0, @@ -3545,7 +3545,7 @@ const unsigned char _Py_M__importlib[] = { 3,0,100,0,0,83,41,1,78,114,4,0,0,0,41,2, 114,22,0,0,0,114,57,1,0,0,41,1,114,169,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,77,0,0,0, - 193,7,0,0,115,2,0,0,0,6,0,122,38,70,105,108, + 194,7,0,0,115,2,0,0,0,6,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,114,116,0,0,0,114,29,0,0,0,78,114,138, @@ -3557,7 +3557,7 @@ const unsigned char _Py_M__importlib[] = { 71,0,0,0,114,35,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,127,0,0,0,114,4,0,0,0,41,1,114,169, - 0,0,0,114,5,0,0,0,114,72,0,0,0,187,7,0, + 0,0,0,114,5,0,0,0,114,72,0,0,0,188,7,0, 0,115,16,0,0,0,0,4,6,1,19,1,36,1,9,2, 15,1,9,1,12,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, @@ -3568,7 +3568,7 @@ const unsigned char _Py_M__importlib[] = { 116,105,109,101,46,114,29,0,0,0,78,114,138,0,0,0, 41,1,114,88,1,0,0,41,1,114,71,0,0,0,114,4, 0,0,0,114,4,0,0,0,114,5,0,0,0,114,74,1, - 0,0,201,7,0,0,115,2,0,0,0,0,2,122,28,70, + 0,0,202,7,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,0,0,3,0,0,0,67,0,0,0, @@ -3592,7 +3592,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,169,0,0,0,114,220,0,0,0,41,3,114,71,0, 0,0,114,158,0,0,0,114,177,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,165,0,0,0, - 207,7,0,0,115,8,0,0,0,0,7,15,1,12,1,10, + 208,7,0,0,115,8,0,0,0,0,7,15,1,12,1,10, 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,7,0,0,0,67,0,0,0,115,40, @@ -3603,7 +3603,7 @@ const unsigned char _Py_M__importlib[] = { 7,114,71,0,0,0,114,243,0,0,0,114,158,0,0,0, 114,35,0,0,0,114,228,0,0,0,114,12,1,0,0,114, 169,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,85,1,0,0,219,7,0,0,115,6,0,0, + 0,0,0,114,85,1,0,0,220,7,0,0,115,6,0,0, 0,0,1,15,1,18,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, @@ -3667,7 +3667,7 @@ const unsigned char _Py_M__importlib[] = { 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,177,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 114,13,1,0,0,224,7,0,0,115,68,0,0,0,0,3, + 114,13,1,0,0,225,7,0,0,115,68,0,0,0,0,3, 6,1,19,1,3,1,34,1,13,1,11,1,15,1,10,1, 12,2,9,1,9,1,15,2,9,1,6,2,12,1,18,1, 22,1,10,1,15,1,12,1,32,4,15,2,22,1,22,1, @@ -3704,7 +3704,7 @@ const unsigned char _Py_M__importlib[] = { 4,0,0,0,41,1,114,139,0,0,0,41,2,114,22,0, 0,0,90,2,102,110,114,4,0,0,0,114,4,0,0,0, 114,5,0,0,0,250,9,60,115,101,116,99,111,109,112,62, - 42,8,0,0,115,2,0,0,0,9,0,122,41,70,105,108, + 43,8,0,0,115,2,0,0,0,9,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,18,114,35,0,0,0,114,3, @@ -3721,7 +3721,7 @@ const unsigned char _Py_M__importlib[] = { 102,102,105,120,95,99,111,110,116,101,110,116,115,114,71,1, 0,0,114,67,0,0,0,114,65,1,0,0,114,57,1,0, 0,90,8,110,101,119,95,110,97,109,101,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,93,1,0,0,13, + 114,4,0,0,0,114,5,0,0,0,114,93,1,0,0,14, 8,0,0,115,34,0,0,0,0,2,9,1,3,1,31,1, 22,3,11,3,18,1,18,7,9,1,13,1,24,1,6,1, 27,2,6,1,17,1,9,1,18,1,122,22,70,105,108,101, @@ -3761,14 +3761,14 @@ const unsigned char _Py_M__importlib[] = { 0,41,2,114,11,1,0,0,114,92,1,0,0,114,4,0, 0,0,114,5,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,54,8,0,0,115,6,0,0,0,0,2,12,1,21,1, + 114,55,8,0,0,115,6,0,0,0,0,2,12,1,21,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,111,107,95,102,111,114,95,70,105, 108,101,70,105,110,100,101,114,114,4,0,0,0,41,3,114, 11,1,0,0,114,92,1,0,0,114,99,1,0,0,114,4, 0,0,0,41,2,114,11,1,0,0,114,92,1,0,0,114, - 5,0,0,0,218,9,112,97,116,104,95,104,111,111,107,44, + 5,0,0,0,218,9,112,97,116,104,95,104,111,111,107,45, 8,0,0,115,4,0,0,0,0,10,21,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, @@ -3777,7 +3777,7 @@ const unsigned char _Py_M__importlib[] = { 16,70,105,108,101,70,105,110,100,101,114,40,123,33,114,125, 41,41,2,114,47,0,0,0,114,35,0,0,0,41,1,114, 71,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,101,0,0,0,62,8,0,0,115,2,0,0, + 0,0,0,114,101,0,0,0,63,8,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,15,114,57,0,0,0,114, 56,0,0,0,114,58,0,0,0,114,59,0,0,0,114,72, @@ -3785,7 +3785,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,114,165,0,0,0,114,85,1,0,0,114,13,1,0, 0,114,93,1,0,0,114,18,1,0,0,114,100,1,0,0, 114,101,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,5,0,0,0,114,86,1,0,0,178,7, + 4,0,0,0,114,5,0,0,0,114,86,1,0,0,179,7, 0,0,115,20,0,0,0,12,7,6,2,12,14,12,4,6, 2,12,12,12,5,15,45,12,31,18,18,114,86,1,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0, @@ -3803,7 +3803,7 @@ const unsigned char _Py_M__importlib[] = { 114,116,32,108,111,99,107,46,78,41,2,114,106,0,0,0, 114,3,1,0,0,41,1,114,71,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,75,0,0,0, - 72,8,0,0,115,2,0,0,0,0,2,122,28,95,73,109, + 73,8,0,0,115,2,0,0,0,0,2,122,28,95,73,109, 112,111,114,116,76,111,99,107,67,111,110,116,101,120,116,46, 95,95,101,110,116,101,114,95,95,99,4,0,0,0,0,0, 0,0,4,0,0,0,1,0,0,0,67,0,0,0,115,14, @@ -3816,13 +3816,13 @@ const unsigned char _Py_M__importlib[] = { 114,71,0,0,0,90,8,101,120,99,95,116,121,112,101,90, 9,101,120,99,95,118,97,108,117,101,90,13,101,120,99,95, 116,114,97,99,101,98,97,99,107,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,81,0,0,0,76,8,0, + 0,0,0,114,5,0,0,0,114,81,0,0,0,77,8,0, 0,115,2,0,0,0,0,2,122,27,95,73,109,112,111,114, 116,76,111,99,107,67,111,110,116,101,120,116,46,95,95,101, 120,105,116,95,95,78,41,6,114,57,0,0,0,114,56,0, 0,0,114,58,0,0,0,114,59,0,0,0,114,75,0,0, 0,114,81,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,101,1,0,0,68, + 114,4,0,0,0,114,5,0,0,0,114,101,1,0,0,69, 8,0,0,115,6,0,0,0,12,2,6,2,12,4,114,101, 1,0,0,99,3,0,0,0,0,0,0,0,5,0,0,0, 4,0,0,0,67,0,0,0,115,91,0,0,0,124,1,0, @@ -3844,7 +3844,7 @@ const unsigned char _Py_M__importlib[] = { 114,67,0,0,0,218,7,112,97,99,107,97,103,101,218,5, 108,101,118,101,108,90,4,98,105,116,115,90,4,98,97,115, 101,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 218,13,95,114,101,115,111,108,118,101,95,110,97,109,101,81, + 218,13,95,114,101,115,111,108,118,101,95,110,97,109,101,82, 8,0,0,115,10,0,0,0,0,2,22,1,18,1,15,1, 10,1,114,104,1,0,0,99,3,0,0,0,0,0,0,0, 4,0,0,0,3,0,0,0,67,0,0,0,115,47,0,0, @@ -3855,7 +3855,7 @@ const unsigned char _Py_M__importlib[] = { 4,114,77,1,0,0,114,67,0,0,0,114,35,0,0,0, 114,169,0,0,0,114,4,0,0,0,114,4,0,0,0,114, 5,0,0,0,218,17,95,102,105,110,100,95,115,112,101,99, - 95,108,101,103,97,99,121,90,8,0,0,115,8,0,0,0, + 95,108,101,103,97,99,121,91,8,0,0,115,8,0,0,0, 0,3,18,1,12,1,4,1,114,105,1,0,0,99,3,0, 0,0,0,0,0,0,9,0,0,0,27,0,0,0,67,0, 0,0,115,34,1,0,0,116,0,0,106,1,0,115,28,0, @@ -3888,7 +3888,7 @@ const unsigned char _Py_M__importlib[] = { 115,95,114,101,108,111,97,100,114,77,1,0,0,114,13,1, 0,0,114,177,0,0,0,114,179,0,0,0,114,208,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 218,10,95,102,105,110,100,95,115,112,101,99,99,8,0,0, + 218,10,95,102,105,110,100,95,115,112,101,99,100,8,0,0, 115,48,0,0,0,0,2,9,1,19,4,15,1,16,1,10, 1,3,1,13,1,13,1,18,1,12,1,11,2,24,1,12, 2,22,1,13,1,3,1,13,1,13,4,9,2,12,1,4, @@ -3926,7 +3926,7 @@ const unsigned char _Py_M__importlib[] = { 114,41,4,114,67,0,0,0,114,102,1,0,0,114,103,1, 0,0,114,171,0,0,0,114,4,0,0,0,114,4,0,0, 0,114,5,0,0,0,218,13,95,115,97,110,105,116,121,95, - 99,104,101,99,107,139,8,0,0,115,24,0,0,0,0,2, + 99,104,101,99,107,140,8,0,0,115,24,0,0,0,0,2, 15,1,30,1,12,1,15,1,6,1,15,1,15,1,15,1, 6,2,27,1,19,1,114,110,1,0,0,122,16,78,111,32, 109,111,100,117,108,101,32,110,97,109,101,100,32,122,4,123, @@ -3964,7 +3964,7 @@ const unsigned char _Py_M__importlib[] = { 108,101,114,171,0,0,0,114,177,0,0,0,114,179,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, 218,23,95,102,105,110,100,95,97,110,100,95,108,111,97,100, - 95,117,110,108,111,99,107,101,100,159,8,0,0,115,42,0, + 95,117,110,108,111,99,107,101,100,160,8,0,0,115,42,0, 0,0,0,1,6,1,19,1,6,1,15,1,16,2,15,1, 11,1,13,1,3,1,13,1,13,1,22,1,26,1,15,1, 12,1,30,2,18,1,6,2,13,1,32,1,114,113,1,0, @@ -3979,7 +3979,7 @@ const unsigned char _Py_M__importlib[] = { 0,114,113,1,0,0,41,2,114,67,0,0,0,114,112,1, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, 0,218,14,95,102,105,110,100,95,97,110,100,95,108,111,97, - 100,186,8,0,0,115,4,0,0,0,0,2,13,1,114,114, + 100,187,8,0,0,115,4,0,0,0,0,2,13,1,114,114, 1,0,0,99,3,0,0,0,0,0,0,0,5,0,0,0, 4,0,0,0,67,0,0,0,115,172,0,0,0,116,0,0, 124,0,0,124,1,0,124,2,0,131,3,0,1,124,2,0, @@ -4022,7 +4022,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,0,114,153,0,0,0,114,112,0,0,0,41,5,114, 67,0,0,0,114,102,1,0,0,114,103,1,0,0,114,179, 0,0,0,114,151,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,115,1,0,0,192,8,0,0, + 0,0,114,5,0,0,0,114,115,1,0,0,193,8,0,0, 115,26,0,0,0,0,9,16,1,12,1,21,1,10,1,15, 1,13,1,13,1,12,1,10,2,15,1,21,1,10,1,114, 115,1,0,0,99,3,0,0,0,0,0,0,0,6,0,0, @@ -4069,7 +4069,7 @@ const unsigned char _Py_M__importlib[] = { 0,0,114,16,0,0,0,90,9,102,114,111,109,95,110,97, 109,101,114,40,1,0,0,114,4,0,0,0,114,4,0,0, 0,114,5,0,0,0,218,16,95,104,97,110,100,108,101,95, - 102,114,111,109,108,105,115,116,216,8,0,0,115,34,0,0, + 102,114,111,109,108,105,115,116,217,8,0,0,115,34,0,0, 0,0,10,15,1,12,1,12,1,13,1,15,1,22,1,13, 1,15,1,21,1,3,1,17,1,18,4,21,1,15,1,9, 1,32,1,114,121,1,0,0,99,1,0,0,0,0,0,0, @@ -4095,7 +4095,7 @@ const unsigned char _Py_M__importlib[] = { 0,41,2,218,7,103,108,111,98,97,108,115,114,102,1,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, 218,17,95,99,97,108,99,95,95,95,112,97,99,107,97,103, - 101,95,95,248,8,0,0,115,12,0,0,0,0,7,15,1, + 101,95,95,249,8,0,0,115,12,0,0,0,0,7,15,1, 12,1,10,1,12,1,25,1,114,123,1,0,0,99,0,0, 0,0,0,0,0,0,3,0,0,0,3,0,0,0,67,0, 0,0,115,55,0,0,0,116,0,0,116,1,0,106,2,0, @@ -4114,7 +4114,7 @@ const unsigned char _Py_M__importlib[] = { 114,232,0,0,0,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, - 5,0,0,0,114,240,0,0,0,7,9,0,0,115,8,0, + 5,0,0,0,114,240,0,0,0,8,9,0,0,115,8,0, 0,0,0,5,18,1,12,1,12,1,114,240,0,0,0,99, 5,0,0,0,0,0,0,0,9,0,0,0,5,0,0,0, 67,0,0,0,115,227,0,0,0,124,4,0,100,1,0,107, @@ -4170,7 +4170,7 @@ const unsigned char _Py_M__importlib[] = { 0,90,8,103,108,111,98,97,108,115,95,114,102,1,0,0, 90,7,99,117,116,95,111,102,102,114,4,0,0,0,114,4, 0,0,0,114,5,0,0,0,218,10,95,95,105,109,112,111, - 114,116,95,95,18,9,0,0,115,26,0,0,0,0,11,12, + 114,116,95,95,19,9,0,0,115,26,0,0,0,0,11,12, 1,15,2,24,1,12,1,18,1,6,3,12,1,23,1,6, 1,4,4,35,3,40,2,114,126,1,0,0,99,1,0,0, 0,0,0,0,0,3,0,0,0,3,0,0,0,67,0,0, @@ -4185,7 +4185,7 @@ const unsigned char _Py_M__importlib[] = { 1,0,0,41,3,114,67,0,0,0,114,177,0,0,0,114, 178,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, 0,0,0,218,18,95,98,117,105,108,116,105,110,95,102,114, - 111,109,95,110,97,109,101,53,9,0,0,115,10,0,0,0, + 111,109,95,110,97,109,101,54,9,0,0,115,10,0,0,0, 0,1,15,1,12,1,19,1,12,1,114,127,1,0,0,99, 2,0,0,0,0,0,0,0,19,0,0,0,12,0,0,0, 67,0,0,0,115,232,2,0,0,124,1,0,97,0,0,124, @@ -4260,7 +4260,7 @@ const unsigned char _Py_M__importlib[] = { 100,1,0,83,41,2,114,29,0,0,0,78,41,1,114,31, 0,0,0,41,2,114,22,0,0,0,114,130,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,77, - 0,0,0,105,9,0,0,115,2,0,0,0,6,0,122,25, + 0,0,0,106,9,0,0,115,2,0,0,0,6,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,84,0,0,0,122,30, 105,109,112,111,114,116,108,105,98,32,114,101,113,117,105,114, @@ -4295,7 +4295,7 @@ const unsigned char _Py_M__importlib[] = { 100,117,108,101,90,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,5,0, - 0,0,218,6,95,115,101,116,117,112,61,9,0,0,115,108, + 0,0,218,6,95,115,101,116,117,112,62,9,0,0,115,108, 0,0,0,0,9,6,1,6,2,12,1,9,2,6,3,12, 1,28,1,15,1,15,1,9,1,15,1,9,2,3,1,15, 1,12,1,20,3,13,1,13,1,15,1,15,2,13,1,20, @@ -4325,7 +4325,7 @@ const unsigned char _Py_M__importlib[] = { 3,114,134,1,0,0,114,135,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,5,0,0,0,218,8,95, - 105,110,115,116,97,108,108,148,9,0,0,115,16,0,0,0, + 105,110,115,116,97,108,108,149,9,0,0,115,16,0,0,0, 0,2,13,1,9,1,28,1,16,1,16,1,15,1,19,1, 114,137,1,0,0,41,3,122,3,119,105,110,114,1,0,0, 0,114,2,0,0,0,41,92,114,59,0,0,0,114,10,0, @@ -4364,7 +4364,7 @@ const unsigned char _Py_M__importlib[] = { 0,6,17,6,3,12,12,12,5,12,5,12,6,12,12,12, 10,12,9,12,5,12,7,15,22,12,8,12,4,15,4,19, 20,6,2,6,3,22,4,19,68,19,21,19,19,12,19,12, - 20,12,114,22,1,18,2,6,2,9,2,9,1,9,2,15, + 20,12,115,22,1,18,2,6,2,9,2,9,1,9,2,15, 27,12,23,12,19,12,12,18,8,12,18,12,11,12,11,12, 17,12,16,21,55,21,12,18,10,12,14,12,36,19,27,19, 106,24,22,9,3,12,1,15,63,18,45,19,230,15,25,19, diff --git a/Python/marshal.c b/Python/marshal.c index dc5411c..ca64be3 100644 --- a/Python/marshal.c +++ b/Python/marshal.c @@ -13,8 +13,6 @@ #include "code.h" #include "marshal.h" -#define ABS(x) ((x) < 0 ? -(x) : (x)) - /* High water mark to determine when the marshalled object is dangerously deep * and risks coring the interpreter. When the object stack gets this deep, * raise an exception instead of continuing. @@ -192,7 +190,7 @@ w_PyLong(const PyLongObject *ob, char flag, WFILE *p) } /* set l to number of base PyLong_MARSHAL_BASE digits */ - n = ABS(Py_SIZE(ob)); + n = Py_ABS(Py_SIZE(ob)); l = (n-1) * PyLong_MARSHAL_RATIO; d = ob->ob_digit[n-1]; assert(d != 0); /* a PyLong is always normalized */ @@ -727,8 +725,8 @@ r_PyLong(RFILE *p) return NULL; } - size = 1 + (ABS(n) - 1) / PyLong_MARSHAL_RATIO; - shorts_in_top_digit = 1 + (ABS(n) - 1) % PyLong_MARSHAL_RATIO; + size = 1 + (Py_ABS(n) - 1) / PyLong_MARSHAL_RATIO; + shorts_in_top_digit = 1 + (Py_ABS(n) - 1) % PyLong_MARSHAL_RATIO; ob = _PyLong_New(size); if (ob == NULL) return NULL; diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index f90a17a..1553a7a 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -15,8 +15,8 @@ static void *opcode_targets[256] = { &&_unknown_opcode, &&_unknown_opcode, &&TARGET_UNARY_INVERT, - &&_unknown_opcode, - &&_unknown_opcode, + &&TARGET_BINARY_MATRIX_MULTIPLY, + &&TARGET_INPLACE_MATRIX_MULTIPLY, &&_unknown_opcode, &&TARGET_BINARY_POWER, &&TARGET_BINARY_MULTIPLY, diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 0327830..b2d5464 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -15,6 +15,7 @@ #include "ast.h" #include "marshal.h" #include "osdefs.h" +#include <locale.h> #ifdef HAVE_SIGNAL_H #include <signal.h> @@ -25,7 +26,6 @@ #endif #ifdef HAVE_LANGINFO_H -#include <locale.h> #include <langinfo.h> #endif @@ -1160,6 +1160,15 @@ initstdio(void) encoding = _Py_StandardStreamEncoding; errors = _Py_StandardStreamErrors; if (!encoding || !errors) { + if (!errors) { + /* When the LC_CTYPE locale is the POSIX locale ("C locale"), + stdin and stdout use the surrogateescape error handler by + default, instead of the strict error handler. */ + char *loc = setlocale(LC_CTYPE, NULL); + if (loc != NULL && strcmp(loc, "C") == 0) + errors = "surrogateescape"; + } + pythonioencoding = Py_GETENV("PYTHONIOENCODING"); if (pythonioencoding) { char *err; @@ -1172,7 +1181,7 @@ initstdio(void) if (err) { *err = '\0'; err++; - if (*err && !errors) { + if (*err && !_Py_StandardStreamErrors) { errors = err; } } diff --git a/Python/random.c b/Python/random.c index 2941ba1..a052b65 100644 --- a/Python/random.c +++ b/Python/random.c @@ -15,8 +15,6 @@ static int _Py_HashSecret_Initialized = 0; #endif #ifdef MS_WINDOWS -/* This handle is never explicitly released. Instead, the operating - system will release it when the process terminates. */ static HCRYPTPROV hCryptProv = 0; static int @@ -298,7 +296,12 @@ _PyRandom_Init(void) void _PyRandom_Fini(void) { -#ifndef MS_WINDOWS +#ifdef MS_WINDOWS + if (hCryptProv) { + CryptReleaseContext(hCryptProv, 0); + hCryptProv = 0; + } +#else dev_urandom_close(); #endif } diff --git a/Python/thread_foobar.h b/Python/thread_foobar.h index d2b78c5..ea96f9c 100644 --- a/Python/thread_foobar.h +++ b/Python/thread_foobar.h @@ -1,4 +1,3 @@ - /* * Initialization. */ @@ -61,10 +60,18 @@ PyThread_free_lock(PyThread_type_lock lock) int PyThread_acquire_lock(PyThread_type_lock lock, int waitflag) { + return PyThread_acquire_lock_timed(lock, waitflag ? -1 : 0, 0); +} + +PyLockStatus +PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds, + int intr_flag) +{ int success; - dprintf(("PyThread_acquire_lock(%p, %d) called\n", lock, waitflag)); - dprintf(("PyThread_acquire_lock(%p, %d) -> %d\n", lock, waitflag, success)); + dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) called\n", lock, microseconds, intr_flag)); + dprintf(("PyThread_acquire_lock_timed(%p, %lld, %d) -> %d\n", + lock, microseconds, intr_flag, success)); return success; } @@ -73,3 +80,53 @@ PyThread_release_lock(PyThread_type_lock lock) { dprintf(("PyThread_release_lock(%p) called\n", lock)); } + +/* The following are only needed if native TLS support exists */ +#define Py_HAVE_NATIVE_TLS + +#ifdef Py_HAVE_NATIVE_TLS +int +PyThread_create_key(void) +{ + int result; + return result; +} + +void +PyThread_delete_key(int key) +{ + +} + +int +PyThread_set_key_value(int key, void *value) +{ + int ok; + + /* A failure in this case returns -1 */ + if (!ok) + return -1; + return 0; +} + +void * +PyThread_get_key_value(int key) +{ + void *result; + + return result; +} + +void +PyThread_delete_key_value(int key) +{ + +} + +void +PyThread_ReInitTLS(void) +{ + +} + +#endif |