diff -r 2f0716009132 Doc/library/dis.rst --- a/Doc/library/dis.rst Tue Jul 12 18:24:25 2016 -0400 +++ b/Doc/library/dis.rst Wed Jul 13 23:06:36 2016 +0300 @@ -777,6 +777,14 @@ All of the following opcodes use their a .. versionadded:: 3.6 +.. opcode:: BUILD_STRING (count) + + Concatenates *count* strings from the stack and pushes the resulting string + onto the stack. + + .. versionadded:: 3.6 + + .. opcode:: LOAD_ATTR (namei) Replaces TOS with ``getattr(TOS, co_names[namei])``. diff -r 2f0716009132 Include/opcode.h --- a/Include/opcode.h Tue Jul 12 18:24:25 2016 -0400 +++ b/Include/opcode.h Wed Jul 13 23:06:36 2016 +0300 @@ -123,6 +123,7 @@ extern "C" { #define SETUP_ASYNC_WITH 154 #define FORMAT_VALUE 155 #define BUILD_CONST_KEY_MAP 156 +#define BUILD_STRING 157 /* EXCEPT_HANDLER is a special, implicit block type which is created when entering an except handler. It is not an opcode but we define it here diff -r 2f0716009132 Include/unicodeobject.h --- a/Include/unicodeobject.h Tue Jul 12 18:24:25 2016 -0400 +++ b/Include/unicodeobject.h Wed Jul 13 23:06:36 2016 +0300 @@ -1955,6 +1955,14 @@ PyAPI_FUNC(PyObject*) PyUnicode_Join( PyObject *seq /* Sequence object */ ); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray( + PyObject *separator, + PyObject **items, + Py_ssize_t seqlen + ); +#endif /* Py_LIMITED_API */ + /* Return 1 if substr matches str[start:end] at the given tail end, 0 otherwise. */ diff -r 2f0716009132 Lib/importlib/_bootstrap_external.py --- a/Lib/importlib/_bootstrap_external.py Tue Jul 12 18:24:25 2016 -0400 +++ b/Lib/importlib/_bootstrap_external.py Wed Jul 13 23:06:36 2016 +0300 @@ -225,7 +225,8 @@ def _write_atomic(path, data, mode=0o666 # Python 3.6a1 3370 (16 bit wordcode) # Python 3.6a1 3371 (add BUILD_CONST_KEY_MAP opcode #27140) # Python 3.6a1 3372 (MAKE_FUNCTION simplification, remove MAKE_CLOSURE - #27095) +# #27095) +# Python 3.6a4 3373 (add BUILD_STRING opcode #27078) # # MAGIC must change whenever the bytecode emitted by the compiler may no # longer be understood by older implementations of the eval loop (usually @@ -234,7 +235,7 @@ def _write_atomic(path, data, mode=0o666 # Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array # in PC/launcher.c must also be updated. -MAGIC_NUMBER = (3372).to_bytes(2, 'little') + b'\r\n' +MAGIC_NUMBER = (3373).to_bytes(2, 'little') + b'\r\n' _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c _PYCACHE = '__pycache__' diff -r 2f0716009132 Lib/opcode.py --- a/Lib/opcode.py Tue Jul 12 18:24:25 2016 -0400 +++ b/Lib/opcode.py Wed Jul 13 23:06:36 2016 +0300 @@ -213,5 +213,6 @@ def_op('BUILD_SET_UNPACK', 153) def_op('FORMAT_VALUE', 155) def_op('BUILD_CONST_KEY_MAP', 156) +def_op('BUILD_STRING', 157) del def_op, name_op, jrel_op, jabs_op diff -r 2f0716009132 Objects/abstract.c --- a/Objects/abstract.c Tue Jul 12 18:24:25 2016 -0400 +++ b/Objects/abstract.c Wed Jul 13 23:06:36 2016 +0300 @@ -674,11 +674,18 @@ PyObject_Format(PyObject *obj, PyObject /* If no format_spec is provided, use an empty string */ if (format_spec == NULL) { + if (PyUnicode_CheckExact(obj)) { + Py_INCREF(obj); + return obj; + } + if (PyLong_CheckExact(obj)) { + return PyObject_Str(obj); + } empty = PyUnicode_New(0, 0); format_spec = empty; } - /* Find the (unbound!) __format__ method (a borrowed reference) */ + /* Find the (unbound!) __format__ method */ meth = _PyObject_LookupSpecial(obj, &PyId___format__); if (meth == NULL) { if (!PyErr_Occurred()) diff -r 2f0716009132 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Tue Jul 12 18:24:25 2016 -0400 +++ b/Objects/unicodeobject.c Wed Jul 13 23:06:36 2016 +0300 @@ -9827,12 +9827,33 @@ case_operation(PyObject *self, PyObject * PyUnicode_Join(PyObject *separator, PyObject *seq) { + PyObject *res; + PyObject *fseq; + Py_ssize_t seqlen; + PyObject **items; + + fseq = PySequence_Fast(seq, "can only join an iterable"); + if (fseq == NULL) { + return NULL; + } + + /* NOTE: the following code can't call back into Python code, + * so we are sure that fseq won't be mutated. + */ + + items = PySequence_Fast_ITEMS(fseq); + seqlen = PySequence_Fast_GET_SIZE(fseq); + res = _PyUnicode_JoinArray(separator, items, seqlen); + Py_DECREF(fseq); + return res; +} + +PyObject * +_PyUnicode_JoinArray(PyObject *separator, PyObject **items, Py_ssize_t seqlen) +{ + PyObject *res = NULL; /* the result */ PyObject *sep = NULL; Py_ssize_t seplen; - PyObject *res = NULL; /* the result */ - PyObject *fseq; /* PySequence_Fast(seq) */ - Py_ssize_t seqlen; /* len(fseq) -- number of items in sequence */ - PyObject **items; PyObject *item; Py_ssize_t sz, i, res_offset; Py_UCS4 maxchar; @@ -9842,30 +9863,17 @@ PyUnicode_Join(PyObject *separator, PyOb PyObject *last_obj; unsigned int kind = 0; - fseq = PySequence_Fast(seq, "can only join an iterable"); - if (fseq == NULL) { - return NULL; - } - - /* NOTE: the following code can't call back into Python code, - * so we are sure that fseq won't be mutated. - */ - - seqlen = PySequence_Fast_GET_SIZE(fseq); /* If empty sequence, return u"". */ if (seqlen == 0) { - Py_DECREF(fseq); _Py_RETURN_UNICODE_EMPTY(); } /* If singleton sequence with an exact Unicode, return that. */ last_obj = NULL; - items = PySequence_Fast_ITEMS(fseq); if (seqlen == 1) { if (PyUnicode_CheckExact(items[0])) { res = items[0]; Py_INCREF(res); - Py_DECREF(fseq); return res; } seplen = 0; @@ -10000,13 +10008,11 @@ PyUnicode_Join(PyObject *separator, PyOb assert(res_offset == PyUnicode_GET_LENGTH(res)); } - Py_DECREF(fseq); Py_XDECREF(sep); assert(_PyUnicode_CheckConsistency(res, 1)); return res; onError: - Py_DECREF(fseq); Py_XDECREF(sep); Py_XDECREF(res); return NULL; diff -r 2f0716009132 PC/launcher.c --- a/PC/launcher.c Tue Jul 12 18:24:25 2016 -0400 +++ b/PC/launcher.c Wed Jul 13 23:06:36 2016 +0300 @@ -1089,7 +1089,7 @@ static PYC_MAGIC magic_values[] = { { 3190, 3230, L"3.3" }, { 3250, 3310, L"3.4" }, { 3320, 3351, L"3.5" }, - { 3360, 3371, L"3.6" }, + { 3360, 3373, L"3.6" }, { 0 } }; diff -r 2f0716009132 Python/ceval.c --- a/Python/ceval.c Tue Jul 12 18:24:25 2016 -0400 +++ b/Python/ceval.c Wed Jul 13 23:06:36 2016 +0300 @@ -2530,6 +2530,23 @@ PyEval_EvalFrameEx(PyFrameObject *f, int DISPATCH(); } + TARGET(BUILD_STRING) { + PyObject *str; + PyObject *sep = PyUnicode_New(0, 0); + if (sep == NULL) { + goto error; + } + str = _PyUnicode_JoinArray(sep, stack_pointer - oparg, oparg); + if (str == NULL) + goto error; + while (--oparg >= 0) { + PyObject *item = POP(); + Py_DECREF(item); + } + PUSH(str); + DISPATCH(); + } + TARGET(BUILD_TUPLE) { PyObject *tup = PyTuple_New(oparg); if (tup == NULL) diff -r 2f0716009132 Python/compile.c --- a/Python/compile.c Tue Jul 12 18:24:25 2016 -0400 +++ b/Python/compile.c Wed Jul 13 23:06:36 2016 +0300 @@ -970,6 +970,7 @@ PyCompile_OpcodeStackEffect(int opcode, case BUILD_TUPLE: case BUILD_LIST: case BUILD_SET: + case BUILD_STRING: return 1-oparg; case BUILD_LIST_UNPACK: case BUILD_TUPLE_UNPACK: @@ -3315,31 +3316,8 @@ compiler_call(struct compiler *c, expr_t static int compiler_joined_str(struct compiler *c, expr_ty e) { - /* Concatenate parts of a string using ''.join(parts). There are - probably better ways of doing this. - - This is used for constructs like "'x=' f'{42}'", which have to - be evaluated at compile time. */ - - static PyObject *empty_string; - static PyObject *join_string; - - if (!empty_string) { - empty_string = PyUnicode_FromString(""); - if (!empty_string) - return 0; - } - if (!join_string) { - join_string = PyUnicode_FromString("join"); - if (!join_string) - return 0; - } - - ADDOP_O(c, LOAD_CONST, empty_string, consts); - ADDOP_NAME(c, LOAD_ATTR, join_string, names); VISIT_SEQ(c, expr, e->v.JoinedStr.values); - ADDOP_I(c, BUILD_LIST, asdl_seq_LEN(e->v.JoinedStr.values)); - ADDOP_I(c, CALL_FUNCTION, 1); + ADDOP_I(c, BUILD_STRING, asdl_seq_LEN(e->v.JoinedStr.values)); return 1; } diff -r 2f0716009132 Python/importlib.h --- a/Python/importlib.h Tue Jul 12 18:24:25 2016 -0400 +++ b/Python/importlib.h Wed Jul 13 23:06:36 2016 +0300 @@ -1676,210 +1676,209 @@ const unsigned char _Py_M__importlib[] = 115,116,238,3,0,0,115,34,0,0,0,0,10,10,1,8, 1,8,1,10,1,10,1,12,1,10,1,10,1,14,1,2, 1,14,1,16,4,14,1,10,1,2,1,24,1,114,195,0, - 0,0,99,1,0,0,0,0,0,0,0,3,0,0,0,7, - 0,0,0,67,0,0,0,115,160,0,0,0,124,0,106,0, + 0,0,99,1,0,0,0,0,0,0,0,3,0,0,0,6, + 0,0,0,67,0,0,0,115,154,0,0,0,124,0,106,0, 100,1,131,1,125,1,124,0,106,0,100,2,131,1,125,2, - 124,1,100,3,107,9,114,92,124,2,100,3,107,9,114,86, - 124,1,124,2,106,1,107,3,114,86,116,2,106,3,100,4, - 106,4,100,5,124,1,155,2,100,6,124,2,106,1,155,2, - 100,7,103,5,131,1,116,5,100,8,100,9,144,1,131,2, - 1,0,124,1,83,0,110,64,124,2,100,3,107,9,114,108, - 124,2,106,1,83,0,110,48,116,2,106,3,100,10,116,5, - 100,8,100,9,144,1,131,2,1,0,124,0,100,11,25,0, - 125,1,100,12,124,0,107,7,114,156,124,1,106,6,100,13, - 131,1,100,14,25,0,125,1,124,1,83,0,41,15,122,167, - 67,97,108,99,117,108,97,116,101,32,119,104,97,116,32,95, - 95,112,97,99,107,97,103,101,95,95,32,115,104,111,117,108, - 100,32,98,101,46,10,10,32,32,32,32,95,95,112,97,99, - 107,97,103,101,95,95,32,105,115,32,110,111,116,32,103,117, - 97,114,97,110,116,101,101,100,32,116,111,32,98,101,32,100, - 101,102,105,110,101,100,32,111,114,32,99,111,117,108,100,32, - 98,101,32,115,101,116,32,116,111,32,78,111,110,101,10,32, - 32,32,32,116,111,32,114,101,112,114,101,115,101,110,116,32, - 116,104,97,116,32,105,116,115,32,112,114,111,112,101,114,32, - 118,97,108,117,101,32,105,115,32,117,110,107,110,111,119,110, - 46,10,10,32,32,32,32,114,134,0,0,0,114,95,0,0, - 0,78,218,0,122,32,95,95,112,97,99,107,97,103,101,95, - 95,32,33,61,32,95,95,115,112,101,99,95,95,46,112,97, - 114,101,110,116,32,40,122,4,32,33,61,32,250,1,41,114, - 140,0,0,0,233,3,0,0,0,122,89,99,97,110,39,116, - 32,114,101,115,111,108,118,101,32,112,97,99,107,97,103,101, - 32,102,114,111,109,32,95,95,115,112,101,99,95,95,32,111, - 114,32,95,95,112,97,99,107,97,103,101,95,95,44,32,102, - 97,108,108,105,110,103,32,98,97,99,107,32,111,110,32,95, - 95,110,97,109,101,95,95,32,97,110,100,32,95,95,112,97, - 116,104,95,95,114,1,0,0,0,114,131,0,0,0,114,121, - 0,0,0,114,33,0,0,0,41,7,114,42,0,0,0,114, - 123,0,0,0,114,142,0,0,0,114,143,0,0,0,114,115, - 0,0,0,114,176,0,0,0,114,122,0,0,0,41,3,218, - 7,103,108,111,98,97,108,115,114,170,0,0,0,114,88,0, - 0,0,114,10,0,0,0,114,10,0,0,0,114,11,0,0, - 0,218,17,95,99,97,108,99,95,95,95,112,97,99,107,97, - 103,101,95,95,14,4,0,0,115,30,0,0,0,0,7,10, - 1,10,1,8,1,18,1,28,2,12,1,6,1,8,1,8, - 2,6,2,12,1,8,1,8,1,14,1,114,200,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,170,0,0,0,124,4,100,1,107,2, - 114,18,116,0,124,0,131,1,125,5,110,36,124,1,100,2, - 107,9,114,30,124,1,110,2,105,0,125,6,116,1,124,6, - 131,1,125,7,116,0,124,0,124,7,124,4,131,3,125,5, - 124,3,115,154,124,4,100,1,107,2,114,86,116,0,124,0, - 106,2,100,3,131,1,100,1,25,0,131,1,83,0,113,166, - 124,0,115,96,124,5,83,0,113,166,116,3,124,0,131,1, - 116,3,124,0,106,2,100,3,131,1,100,1,25,0,131,1, - 24,0,125,8,116,4,106,5,124,5,106,6,100,2,116,3, - 124,5,106,6,131,1,124,8,24,0,133,2,25,0,25,0, - 83,0,110,12,116,7,124,5,124,3,116,0,131,3,83,0, - 100,2,83,0,41,4,97,215,1,0,0,73,109,112,111,114, - 116,32,97,32,109,111,100,117,108,101,46,10,10,32,32,32, - 32,84,104,101,32,39,103,108,111,98,97,108,115,39,32,97, - 114,103,117,109,101,110,116,32,105,115,32,117,115,101,100,32, - 116,111,32,105,110,102,101,114,32,119,104,101,114,101,32,116, - 104,101,32,105,109,112,111,114,116,32,105,115,32,111,99,99, - 117,114,114,105,110,103,32,102,114,111,109,10,32,32,32,32, - 116,111,32,104,97,110,100,108,101,32,114,101,108,97,116,105, - 118,101,32,105,109,112,111,114,116,115,46,32,84,104,101,32, - 39,108,111,99,97,108,115,39,32,97,114,103,117,109,101,110, - 116,32,105,115,32,105,103,110,111,114,101,100,46,32,84,104, - 101,10,32,32,32,32,39,102,114,111,109,108,105,115,116,39, - 32,97,114,103,117,109,101,110,116,32,115,112,101,99,105,102, - 105,101,115,32,119,104,97,116,32,115,104,111,117,108,100,32, - 101,120,105,115,116,32,97,115,32,97,116,116,114,105,98,117, - 116,101,115,32,111,110,32,116,104,101,32,109,111,100,117,108, - 101,10,32,32,32,32,98,101,105,110,103,32,105,109,112,111, - 114,116,101,100,32,40,101,46,103,46,32,96,96,102,114,111, - 109,32,109,111,100,117,108,101,32,105,109,112,111,114,116,32, - 60,102,114,111,109,108,105,115,116,62,96,96,41,46,32,32, - 84,104,101,32,39,108,101,118,101,108,39,10,32,32,32,32, - 97,114,103,117,109,101,110,116,32,114,101,112,114,101,115,101, - 110,116,115,32,116,104,101,32,112,97,99,107,97,103,101,32, - 108,111,99,97,116,105,111,110,32,116,111,32,105,109,112,111, - 114,116,32,102,114,111,109,32,105,110,32,97,32,114,101,108, - 97,116,105,118,101,10,32,32,32,32,105,109,112,111,114,116, - 32,40,101,46,103,46,32,96,96,102,114,111,109,32,46,46, - 112,107,103,32,105,109,112,111,114,116,32,109,111,100,96,96, - 32,119,111,117,108,100,32,104,97,118,101,32,97,32,39,108, - 101,118,101,108,39,32,111,102,32,50,41,46,10,10,32,32, - 32,32,114,33,0,0,0,78,114,121,0,0,0,41,8,114, - 187,0,0,0,114,200,0,0,0,218,9,112,97,114,116,105, - 116,105,111,110,114,168,0,0,0,114,14,0,0,0,114,21, - 0,0,0,114,1,0,0,0,114,195,0,0,0,41,9,114, - 15,0,0,0,114,199,0,0,0,218,6,108,111,99,97,108, - 115,114,193,0,0,0,114,171,0,0,0,114,89,0,0,0, - 90,8,103,108,111,98,97,108,115,95,114,170,0,0,0,90, - 7,99,117,116,95,111,102,102,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,218,10,95,95,105,109,112,111,114, - 116,95,95,41,4,0,0,115,26,0,0,0,0,11,8,1, - 10,2,16,1,8,1,12,1,4,3,8,1,20,1,4,1, - 6,4,26,3,32,2,114,203,0,0,0,99,1,0,0,0, - 0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,0, - 115,38,0,0,0,116,0,106,1,124,0,131,1,125,1,124, - 1,100,0,107,8,114,30,116,2,100,1,124,0,23,0,131, - 1,130,1,116,3,124,1,131,1,83,0,41,2,78,122,25, - 110,111,32,98,117,105,108,116,45,105,110,32,109,111,100,117, - 108,101,32,110,97,109,101,100,32,41,4,114,151,0,0,0, - 114,155,0,0,0,114,77,0,0,0,114,150,0,0,0,41, - 2,114,15,0,0,0,114,88,0,0,0,114,10,0,0,0, - 114,10,0,0,0,114,11,0,0,0,218,18,95,98,117,105, - 108,116,105,110,95,102,114,111,109,95,110,97,109,101,76,4, - 0,0,115,8,0,0,0,0,1,10,1,8,1,12,1,114, - 204,0,0,0,99,2,0,0,0,0,0,0,0,12,0,0, - 0,12,0,0,0,67,0,0,0,115,244,0,0,0,124,1, - 97,0,124,0,97,1,116,2,116,1,131,1,125,2,120,86, - 116,1,106,3,106,4,131,0,68,0,93,72,92,2,125,3, - 125,4,116,5,124,4,124,2,131,2,114,28,124,3,116,1, - 106,6,107,6,114,62,116,7,125,5,110,18,116,0,106,8, - 124,3,131,1,114,28,116,9,125,5,110,2,113,28,116,10, - 124,4,124,5,131,2,125,6,116,11,124,6,124,4,131,2, - 1,0,113,28,87,0,116,1,106,3,116,12,25,0,125,7, - 120,54,100,5,68,0,93,46,125,8,124,8,116,1,106,3, - 107,7,114,144,116,13,124,8,131,1,125,9,110,10,116,1, - 106,3,124,8,25,0,125,9,116,14,124,7,124,8,124,9, - 131,3,1,0,113,120,87,0,121,12,116,13,100,2,131,1, - 125,10,87,0,110,24,4,0,116,15,107,10,114,206,1,0, - 1,0,1,0,100,3,125,10,89,0,110,2,88,0,116,14, - 124,7,100,2,124,10,131,3,1,0,116,13,100,4,131,1, - 125,11,116,14,124,7,100,4,124,11,131,3,1,0,100,3, - 83,0,41,6,122,250,83,101,116,117,112,32,105,109,112,111, - 114,116,108,105,98,32,98,121,32,105,109,112,111,114,116,105, - 110,103,32,110,101,101,100,101,100,32,98,117,105,108,116,45, - 105,110,32,109,111,100,117,108,101,115,32,97,110,100,32,105, - 110,106,101,99,116,105,110,103,32,116,104,101,109,10,32,32, - 32,32,105,110,116,111,32,116,104,101,32,103,108,111,98,97, - 108,32,110,97,109,101,115,112,97,99,101,46,10,10,32,32, - 32,32,65,115,32,115,121,115,32,105,115,32,110,101,101,100, - 101,100,32,102,111,114,32,115,121,115,46,109,111,100,117,108, - 101,115,32,97,99,99,101,115,115,32,97,110,100,32,95,105, - 109,112,32,105,115,32,110,101,101,100,101,100,32,116,111,32, - 108,111,97,100,32,98,117,105,108,116,45,105,110,10,32,32, - 32,32,109,111,100,117,108,101,115,44,32,116,104,111,115,101, - 32,116,119,111,32,109,111,100,117,108,101,115,32,109,117,115, - 116,32,98,101,32,101,120,112,108,105,99,105,116,108,121,32, - 112,97,115,115,101,100,32,105,110,46,10,10,32,32,32,32, - 114,142,0,0,0,114,34,0,0,0,78,114,62,0,0,0, - 41,1,122,9,95,119,97,114,110,105,110,103,115,41,16,114, - 57,0,0,0,114,14,0,0,0,114,13,0,0,0,114,21, - 0,0,0,218,5,105,116,101,109,115,114,178,0,0,0,114, - 76,0,0,0,114,151,0,0,0,114,82,0,0,0,114,161, - 0,0,0,114,132,0,0,0,114,137,0,0,0,114,1,0, - 0,0,114,204,0,0,0,114,5,0,0,0,114,77,0,0, - 0,41,12,218,10,115,121,115,95,109,111,100,117,108,101,218, - 11,95,105,109,112,95,109,111,100,117,108,101,90,11,109,111, - 100,117,108,101,95,116,121,112,101,114,15,0,0,0,114,89, - 0,0,0,114,99,0,0,0,114,88,0,0,0,90,11,115, - 101,108,102,95,109,111,100,117,108,101,90,12,98,117,105,108, - 116,105,110,95,110,97,109,101,90,14,98,117,105,108,116,105, - 110,95,109,111,100,117,108,101,90,13,116,104,114,101,97,100, - 95,109,111,100,117,108,101,90,14,119,101,97,107,114,101,102, - 95,109,111,100,117,108,101,114,10,0,0,0,114,10,0,0, - 0,114,11,0,0,0,218,6,95,115,101,116,117,112,83,4, - 0,0,115,50,0,0,0,0,9,4,1,4,3,8,1,20, - 1,10,1,10,1,6,1,10,1,6,2,2,1,10,1,14, - 3,10,1,10,1,10,1,10,2,10,1,16,3,2,1,12, - 1,14,2,10,1,12,3,8,1,114,208,0,0,0,99,2, - 0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,67, - 0,0,0,115,66,0,0,0,116,0,124,0,124,1,131,2, - 1,0,116,1,106,2,106,3,116,4,131,1,1,0,116,1, - 106,2,106,3,116,5,131,1,1,0,100,1,100,2,108,6, - 125,2,124,2,97,7,124,2,106,8,116,1,106,9,116,10, - 25,0,131,1,1,0,100,2,83,0,41,3,122,50,73,110, - 115,116,97,108,108,32,105,109,112,111,114,116,108,105,98,32, - 97,115,32,116,104,101,32,105,109,112,108,101,109,101,110,116, - 97,116,105,111,110,32,111,102,32,105,109,112,111,114,116,46, - 114,33,0,0,0,78,41,11,114,208,0,0,0,114,14,0, - 0,0,114,175,0,0,0,114,113,0,0,0,114,151,0,0, - 0,114,161,0,0,0,218,26,95,102,114,111,122,101,110,95, - 105,109,112,111,114,116,108,105,98,95,101,120,116,101,114,110, - 97,108,114,119,0,0,0,218,8,95,105,110,115,116,97,108, - 108,114,21,0,0,0,114,1,0,0,0,41,3,114,206,0, - 0,0,114,207,0,0,0,114,209,0,0,0,114,10,0,0, - 0,114,10,0,0,0,114,11,0,0,0,114,210,0,0,0, - 130,4,0,0,115,12,0,0,0,0,2,10,2,12,1,12, - 3,8,1,4,1,114,210,0,0,0,41,2,78,78,41,1, - 78,41,2,78,114,33,0,0,0,41,51,114,3,0,0,0, - 114,119,0,0,0,114,12,0,0,0,114,16,0,0,0,114, - 17,0,0,0,114,59,0,0,0,114,41,0,0,0,114,48, - 0,0,0,114,31,0,0,0,114,32,0,0,0,114,53,0, - 0,0,114,54,0,0,0,114,56,0,0,0,114,63,0,0, - 0,114,65,0,0,0,114,75,0,0,0,114,81,0,0,0, - 114,84,0,0,0,114,90,0,0,0,114,101,0,0,0,114, - 102,0,0,0,114,106,0,0,0,114,85,0,0,0,218,6, - 111,98,106,101,99,116,90,9,95,80,79,80,85,76,65,84, - 69,114,132,0,0,0,114,137,0,0,0,114,145,0,0,0, - 114,97,0,0,0,114,86,0,0,0,114,149,0,0,0,114, - 150,0,0,0,114,87,0,0,0,114,151,0,0,0,114,161, - 0,0,0,114,166,0,0,0,114,172,0,0,0,114,174,0, - 0,0,114,177,0,0,0,114,182,0,0,0,114,192,0,0, - 0,114,183,0,0,0,114,185,0,0,0,114,186,0,0,0, - 114,187,0,0,0,114,195,0,0,0,114,200,0,0,0,114, - 203,0,0,0,114,204,0,0,0,114,208,0,0,0,114,210, - 0,0,0,114,10,0,0,0,114,10,0,0,0,114,10,0, - 0,0,114,11,0,0,0,218,8,60,109,111,100,117,108,101, - 62,8,0,0,0,115,96,0,0,0,4,17,4,2,8,8, - 8,4,14,20,4,2,4,3,16,4,14,68,14,21,14,19, - 8,19,8,19,8,11,14,8,8,11,8,12,8,16,8,36, - 14,27,14,101,16,26,6,3,10,45,14,60,8,18,8,17, - 8,25,8,29,8,23,8,16,14,73,14,77,14,13,8,9, - 8,9,10,47,8,20,4,1,8,2,8,27,8,6,10,24, - 8,32,8,27,18,35,8,7,8,47, + 124,1,100,3,107,9,114,86,124,2,100,3,107,9,114,80, + 124,1,124,2,106,1,107,3,114,80,116,2,106,3,100,4, + 124,1,155,2,100,5,124,2,106,1,155,2,100,6,157,5, + 116,4,100,7,100,8,144,1,131,2,1,0,124,1,83,0, + 110,64,124,2,100,3,107,9,114,102,124,2,106,1,83,0, + 110,48,116,2,106,3,100,9,116,4,100,7,100,8,144,1, + 131,2,1,0,124,0,100,10,25,0,125,1,100,11,124,0, + 107,7,114,150,124,1,106,5,100,12,131,1,100,13,25,0, + 125,1,124,1,83,0,41,14,122,167,67,97,108,99,117,108, + 97,116,101,32,119,104,97,116,32,95,95,112,97,99,107,97, + 103,101,95,95,32,115,104,111,117,108,100,32,98,101,46,10, + 10,32,32,32,32,95,95,112,97,99,107,97,103,101,95,95, + 32,105,115,32,110,111,116,32,103,117,97,114,97,110,116,101, + 101,100,32,116,111,32,98,101,32,100,101,102,105,110,101,100, + 32,111,114,32,99,111,117,108,100,32,98,101,32,115,101,116, + 32,116,111,32,78,111,110,101,10,32,32,32,32,116,111,32, + 114,101,112,114,101,115,101,110,116,32,116,104,97,116,32,105, + 116,115,32,112,114,111,112,101,114,32,118,97,108,117,101,32, + 105,115,32,117,110,107,110,111,119,110,46,10,10,32,32,32, + 32,114,134,0,0,0,114,95,0,0,0,78,122,32,95,95, + 112,97,99,107,97,103,101,95,95,32,33,61,32,95,95,115, + 112,101,99,95,95,46,112,97,114,101,110,116,32,40,122,4, + 32,33,61,32,250,1,41,114,140,0,0,0,233,3,0,0, + 0,122,89,99,97,110,39,116,32,114,101,115,111,108,118,101, + 32,112,97,99,107,97,103,101,32,102,114,111,109,32,95,95, + 115,112,101,99,95,95,32,111,114,32,95,95,112,97,99,107, + 97,103,101,95,95,44,32,102,97,108,108,105,110,103,32,98, + 97,99,107,32,111,110,32,95,95,110,97,109,101,95,95,32, + 97,110,100,32,95,95,112,97,116,104,95,95,114,1,0,0, + 0,114,131,0,0,0,114,121,0,0,0,114,33,0,0,0, + 41,6,114,42,0,0,0,114,123,0,0,0,114,142,0,0, + 0,114,143,0,0,0,114,176,0,0,0,114,122,0,0,0, + 41,3,218,7,103,108,111,98,97,108,115,114,170,0,0,0, + 114,88,0,0,0,114,10,0,0,0,114,10,0,0,0,114, + 11,0,0,0,218,17,95,99,97,108,99,95,95,95,112,97, + 99,107,97,103,101,95,95,14,4,0,0,115,30,0,0,0, + 0,7,10,1,10,1,8,1,18,1,22,2,12,1,6,1, + 8,1,8,2,6,2,12,1,8,1,8,1,14,1,114,199, + 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,170,0,0,0,124,4,100, + 1,107,2,114,18,116,0,124,0,131,1,125,5,110,36,124, + 1,100,2,107,9,114,30,124,1,110,2,105,0,125,6,116, + 1,124,6,131,1,125,7,116,0,124,0,124,7,124,4,131, + 3,125,5,124,3,115,154,124,4,100,1,107,2,114,86,116, + 0,124,0,106,2,100,3,131,1,100,1,25,0,131,1,83, + 0,113,166,124,0,115,96,124,5,83,0,113,166,116,3,124, + 0,131,1,116,3,124,0,106,2,100,3,131,1,100,1,25, + 0,131,1,24,0,125,8,116,4,106,5,124,5,106,6,100, + 2,116,3,124,5,106,6,131,1,124,8,24,0,133,2,25, + 0,25,0,83,0,110,12,116,7,124,5,124,3,116,0,131, + 3,83,0,100,2,83,0,41,4,97,215,1,0,0,73,109, + 112,111,114,116,32,97,32,109,111,100,117,108,101,46,10,10, + 32,32,32,32,84,104,101,32,39,103,108,111,98,97,108,115, + 39,32,97,114,103,117,109,101,110,116,32,105,115,32,117,115, + 101,100,32,116,111,32,105,110,102,101,114,32,119,104,101,114, + 101,32,116,104,101,32,105,109,112,111,114,116,32,105,115,32, + 111,99,99,117,114,114,105,110,103,32,102,114,111,109,10,32, + 32,32,32,116,111,32,104,97,110,100,108,101,32,114,101,108, + 97,116,105,118,101,32,105,109,112,111,114,116,115,46,32,84, + 104,101,32,39,108,111,99,97,108,115,39,32,97,114,103,117, + 109,101,110,116,32,105,115,32,105,103,110,111,114,101,100,46, + 32,84,104,101,10,32,32,32,32,39,102,114,111,109,108,105, + 115,116,39,32,97,114,103,117,109,101,110,116,32,115,112,101, + 99,105,102,105,101,115,32,119,104,97,116,32,115,104,111,117, + 108,100,32,101,120,105,115,116,32,97,115,32,97,116,116,114, + 105,98,117,116,101,115,32,111,110,32,116,104,101,32,109,111, + 100,117,108,101,10,32,32,32,32,98,101,105,110,103,32,105, + 109,112,111,114,116,101,100,32,40,101,46,103,46,32,96,96, + 102,114,111,109,32,109,111,100,117,108,101,32,105,109,112,111, + 114,116,32,60,102,114,111,109,108,105,115,116,62,96,96,41, + 46,32,32,84,104,101,32,39,108,101,118,101,108,39,10,32, + 32,32,32,97,114,103,117,109,101,110,116,32,114,101,112,114, + 101,115,101,110,116,115,32,116,104,101,32,112,97,99,107,97, + 103,101,32,108,111,99,97,116,105,111,110,32,116,111,32,105, + 109,112,111,114,116,32,102,114,111,109,32,105,110,32,97,32, + 114,101,108,97,116,105,118,101,10,32,32,32,32,105,109,112, + 111,114,116,32,40,101,46,103,46,32,96,96,102,114,111,109, + 32,46,46,112,107,103,32,105,109,112,111,114,116,32,109,111, + 100,96,96,32,119,111,117,108,100,32,104,97,118,101,32,97, + 32,39,108,101,118,101,108,39,32,111,102,32,50,41,46,10, + 10,32,32,32,32,114,33,0,0,0,78,114,121,0,0,0, + 41,8,114,187,0,0,0,114,199,0,0,0,218,9,112,97, + 114,116,105,116,105,111,110,114,168,0,0,0,114,14,0,0, + 0,114,21,0,0,0,114,1,0,0,0,114,195,0,0,0, + 41,9,114,15,0,0,0,114,198,0,0,0,218,6,108,111, + 99,97,108,115,114,193,0,0,0,114,171,0,0,0,114,89, + 0,0,0,90,8,103,108,111,98,97,108,115,95,114,170,0, + 0,0,90,7,99,117,116,95,111,102,102,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,218,10,95,95,105,109, + 112,111,114,116,95,95,41,4,0,0,115,26,0,0,0,0, + 11,8,1,10,2,16,1,8,1,12,1,4,3,8,1,20, + 1,4,1,6,4,26,3,32,2,114,202,0,0,0,99,1, + 0,0,0,0,0,0,0,2,0,0,0,3,0,0,0,67, + 0,0,0,115,38,0,0,0,116,0,106,1,124,0,131,1, + 125,1,124,1,100,0,107,8,114,30,116,2,100,1,124,0, + 23,0,131,1,130,1,116,3,124,1,131,1,83,0,41,2, + 78,122,25,110,111,32,98,117,105,108,116,45,105,110,32,109, + 111,100,117,108,101,32,110,97,109,101,100,32,41,4,114,151, + 0,0,0,114,155,0,0,0,114,77,0,0,0,114,150,0, + 0,0,41,2,114,15,0,0,0,114,88,0,0,0,114,10, + 0,0,0,114,10,0,0,0,114,11,0,0,0,218,18,95, + 98,117,105,108,116,105,110,95,102,114,111,109,95,110,97,109, + 101,76,4,0,0,115,8,0,0,0,0,1,10,1,8,1, + 12,1,114,203,0,0,0,99,2,0,0,0,0,0,0,0, + 12,0,0,0,12,0,0,0,67,0,0,0,115,244,0,0, + 0,124,1,97,0,124,0,97,1,116,2,116,1,131,1,125, + 2,120,86,116,1,106,3,106,4,131,0,68,0,93,72,92, + 2,125,3,125,4,116,5,124,4,124,2,131,2,114,28,124, + 3,116,1,106,6,107,6,114,62,116,7,125,5,110,18,116, + 0,106,8,124,3,131,1,114,28,116,9,125,5,110,2,113, + 28,116,10,124,4,124,5,131,2,125,6,116,11,124,6,124, + 4,131,2,1,0,113,28,87,0,116,1,106,3,116,12,25, + 0,125,7,120,54,100,5,68,0,93,46,125,8,124,8,116, + 1,106,3,107,7,114,144,116,13,124,8,131,1,125,9,110, + 10,116,1,106,3,124,8,25,0,125,9,116,14,124,7,124, + 8,124,9,131,3,1,0,113,120,87,0,121,12,116,13,100, + 2,131,1,125,10,87,0,110,24,4,0,116,15,107,10,114, + 206,1,0,1,0,1,0,100,3,125,10,89,0,110,2,88, + 0,116,14,124,7,100,2,124,10,131,3,1,0,116,13,100, + 4,131,1,125,11,116,14,124,7,100,4,124,11,131,3,1, + 0,100,3,83,0,41,6,122,250,83,101,116,117,112,32,105, + 109,112,111,114,116,108,105,98,32,98,121,32,105,109,112,111, + 114,116,105,110,103,32,110,101,101,100,101,100,32,98,117,105, + 108,116,45,105,110,32,109,111,100,117,108,101,115,32,97,110, + 100,32,105,110,106,101,99,116,105,110,103,32,116,104,101,109, + 10,32,32,32,32,105,110,116,111,32,116,104,101,32,103,108, + 111,98,97,108,32,110,97,109,101,115,112,97,99,101,46,10, + 10,32,32,32,32,65,115,32,115,121,115,32,105,115,32,110, + 101,101,100,101,100,32,102,111,114,32,115,121,115,46,109,111, + 100,117,108,101,115,32,97,99,99,101,115,115,32,97,110,100, + 32,95,105,109,112,32,105,115,32,110,101,101,100,101,100,32, + 116,111,32,108,111,97,100,32,98,117,105,108,116,45,105,110, + 10,32,32,32,32,109,111,100,117,108,101,115,44,32,116,104, + 111,115,101,32,116,119,111,32,109,111,100,117,108,101,115,32, + 109,117,115,116,32,98,101,32,101,120,112,108,105,99,105,116, + 108,121,32,112,97,115,115,101,100,32,105,110,46,10,10,32, + 32,32,32,114,142,0,0,0,114,34,0,0,0,78,114,62, + 0,0,0,41,1,122,9,95,119,97,114,110,105,110,103,115, + 41,16,114,57,0,0,0,114,14,0,0,0,114,13,0,0, + 0,114,21,0,0,0,218,5,105,116,101,109,115,114,178,0, + 0,0,114,76,0,0,0,114,151,0,0,0,114,82,0,0, + 0,114,161,0,0,0,114,132,0,0,0,114,137,0,0,0, + 114,1,0,0,0,114,203,0,0,0,114,5,0,0,0,114, + 77,0,0,0,41,12,218,10,115,121,115,95,109,111,100,117, + 108,101,218,11,95,105,109,112,95,109,111,100,117,108,101,90, + 11,109,111,100,117,108,101,95,116,121,112,101,114,15,0,0, + 0,114,89,0,0,0,114,99,0,0,0,114,88,0,0,0, + 90,11,115,101,108,102,95,109,111,100,117,108,101,90,12,98, + 117,105,108,116,105,110,95,110,97,109,101,90,14,98,117,105, + 108,116,105,110,95,109,111,100,117,108,101,90,13,116,104,114, + 101,97,100,95,109,111,100,117,108,101,90,14,119,101,97,107, + 114,101,102,95,109,111,100,117,108,101,114,10,0,0,0,114, + 10,0,0,0,114,11,0,0,0,218,6,95,115,101,116,117, + 112,83,4,0,0,115,50,0,0,0,0,9,4,1,4,3, + 8,1,20,1,10,1,10,1,6,1,10,1,6,2,2,1, + 10,1,14,3,10,1,10,1,10,1,10,2,10,1,16,3, + 2,1,12,1,14,2,10,1,12,3,8,1,114,207,0,0, + 0,99,2,0,0,0,0,0,0,0,3,0,0,0,3,0, + 0,0,67,0,0,0,115,66,0,0,0,116,0,124,0,124, + 1,131,2,1,0,116,1,106,2,106,3,116,4,131,1,1, + 0,116,1,106,2,106,3,116,5,131,1,1,0,100,1,100, + 2,108,6,125,2,124,2,97,7,124,2,106,8,116,1,106, + 9,116,10,25,0,131,1,1,0,100,2,83,0,41,3,122, + 50,73,110,115,116,97,108,108,32,105,109,112,111,114,116,108, + 105,98,32,97,115,32,116,104,101,32,105,109,112,108,101,109, + 101,110,116,97,116,105,111,110,32,111,102,32,105,109,112,111, + 114,116,46,114,33,0,0,0,78,41,11,114,207,0,0,0, + 114,14,0,0,0,114,175,0,0,0,114,113,0,0,0,114, + 151,0,0,0,114,161,0,0,0,218,26,95,102,114,111,122, + 101,110,95,105,109,112,111,114,116,108,105,98,95,101,120,116, + 101,114,110,97,108,114,119,0,0,0,218,8,95,105,110,115, + 116,97,108,108,114,21,0,0,0,114,1,0,0,0,41,3, + 114,205,0,0,0,114,206,0,0,0,114,208,0,0,0,114, + 10,0,0,0,114,10,0,0,0,114,11,0,0,0,114,209, + 0,0,0,130,4,0,0,115,12,0,0,0,0,2,10,2, + 12,1,12,3,8,1,4,1,114,209,0,0,0,41,2,78, + 78,41,1,78,41,2,78,114,33,0,0,0,41,51,114,3, + 0,0,0,114,119,0,0,0,114,12,0,0,0,114,16,0, + 0,0,114,17,0,0,0,114,59,0,0,0,114,41,0,0, + 0,114,48,0,0,0,114,31,0,0,0,114,32,0,0,0, + 114,53,0,0,0,114,54,0,0,0,114,56,0,0,0,114, + 63,0,0,0,114,65,0,0,0,114,75,0,0,0,114,81, + 0,0,0,114,84,0,0,0,114,90,0,0,0,114,101,0, + 0,0,114,102,0,0,0,114,106,0,0,0,114,85,0,0, + 0,218,6,111,98,106,101,99,116,90,9,95,80,79,80,85, + 76,65,84,69,114,132,0,0,0,114,137,0,0,0,114,145, + 0,0,0,114,97,0,0,0,114,86,0,0,0,114,149,0, + 0,0,114,150,0,0,0,114,87,0,0,0,114,151,0,0, + 0,114,161,0,0,0,114,166,0,0,0,114,172,0,0,0, + 114,174,0,0,0,114,177,0,0,0,114,182,0,0,0,114, + 192,0,0,0,114,183,0,0,0,114,185,0,0,0,114,186, + 0,0,0,114,187,0,0,0,114,195,0,0,0,114,199,0, + 0,0,114,202,0,0,0,114,203,0,0,0,114,207,0,0, + 0,114,209,0,0,0,114,10,0,0,0,114,10,0,0,0, + 114,10,0,0,0,114,11,0,0,0,218,8,60,109,111,100, + 117,108,101,62,8,0,0,0,115,96,0,0,0,4,17,4, + 2,8,8,8,4,14,20,4,2,4,3,16,4,14,68,14, + 21,14,19,8,19,8,19,8,11,14,8,8,11,8,12,8, + 16,8,36,14,27,14,101,16,26,6,3,10,45,14,60,8, + 18,8,17,8,25,8,29,8,23,8,16,14,73,14,77,14, + 13,8,9,8,9,10,47,8,20,4,1,8,2,8,27,8, + 6,10,24,8,32,8,27,18,35,8,7,8,47, }; diff -r 2f0716009132 Python/importlib_external.h --- a/Python/importlib_external.h Tue Jul 12 18:24:25 2016 -0400 +++ b/Python/importlib_external.h Wed Jul 13 23:06:36 2016 +0300 @@ -235,7 +235,7 @@ const unsigned char _Py_M__importlib_ext 0,114,5,0,0,0,218,13,95,119,114,105,116,101,95,97, 116,111,109,105,99,99,0,0,0,115,26,0,0,0,0,5, 16,1,6,1,26,1,2,3,14,1,20,1,16,1,14,1, - 2,1,14,1,14,1,6,1,114,56,0,0,0,105,44,13, + 2,1,14,1,14,1,6,1,114,56,0,0,0,105,45,13, 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,4,111,112,116,45,122,3,46,112,121,122,4,46,112,121, @@ -338,7 +338,7 @@ const unsigned char _Py_M__importlib_ext 115,116,90,3,116,97,103,90,15,97,108,109,111,115,116,95, 102,105,108,101,110,97,109,101,114,4,0,0,0,114,4,0, 0,0,114,5,0,0,0,218,17,99,97,99,104,101,95,102, - 114,111,109,95,115,111,117,114,99,101,249,0,0,0,115,46, + 114,111,109,95,115,111,117,114,99,101,250,0,0,0,115,46, 0,0,0,0,18,8,1,6,1,6,1,8,1,4,1,8, 1,12,1,12,1,16,1,8,1,8,1,8,1,24,1,8, 1,12,1,6,2,8,1,8,1,8,1,8,1,14,1,14, @@ -411,7 +411,7 @@ const unsigned char _Py_M__importlib_ext 112,116,95,108,101,118,101,108,90,13,98,97,115,101,95,102, 105,108,101,110,97,109,101,114,4,0,0,0,114,4,0,0, 0,114,5,0,0,0,218,17,115,111,117,114,99,101,95,102, - 114,111,109,95,99,97,99,104,101,37,1,0,0,115,44,0, + 114,111,109,95,99,97,99,104,101,38,1,0,0,115,44,0, 0,0,0,9,12,1,8,1,12,1,12,1,8,1,6,1, 10,1,10,1,8,1,6,1,10,1,8,1,16,1,10,1, 6,1,8,1,16,1,8,1,6,1,8,1,14,1,114,86, @@ -446,7 +446,7 @@ const unsigned char _Py_M__importlib_ext 0,0,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,70, + 95,103,101,116,95,115,111,117,114,99,101,102,105,108,101,71, 1,0,0,115,20,0,0,0,0,7,12,1,4,1,16,1, 26,1,4,1,2,1,12,1,18,1,18,1,114,92,0,0, 0,99,1,0,0,0,0,0,0,0,1,0,0,0,11,0, @@ -460,7 +460,7 @@ const unsigned char _Py_M__importlib_ext 114,80,0,0,0,114,67,0,0,0,114,75,0,0,0,41, 1,218,8,102,105,108,101,110,97,109,101,114,4,0,0,0, 114,4,0,0,0,114,5,0,0,0,218,11,95,103,101,116, - 95,99,97,99,104,101,100,89,1,0,0,115,16,0,0,0, + 95,99,97,99,104,101,100,90,1,0,0,115,16,0,0,0, 0,1,14,1,2,1,8,1,14,1,8,1,14,1,6,2, 114,96,0,0,0,99,1,0,0,0,0,0,0,0,2,0, 0,0,11,0,0,0,67,0,0,0,115,52,0,0,0,121, @@ -474,7 +474,7 @@ const unsigned char _Py_M__importlib_ext 128,0,0,0,41,3,114,39,0,0,0,114,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,101,1,0,0, + 218,10,95,99,97,108,99,95,109,111,100,101,102,1,0,0, 115,12,0,0,0,0,2,2,1,14,1,14,1,10,3,8, 1,114,98,0,0,0,99,1,0,0,0,0,0,0,0,3, 0,0,0,11,0,0,0,3,0,0,0,115,68,0,0,0, @@ -512,7 +512,7 @@ const unsigned char _Py_M__importlib_ext 6,107,119,97,114,103,115,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, - 121,1,0,0,115,12,0,0,0,0,1,8,1,8,1,10, + 122,1,0,0,115,12,0,0,0,0,1,8,1,8,1,10, 1,4,1,20,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,99, @@ -532,7 +532,7 @@ const unsigned char _Py_M__importlib_ext 114,218,8,95,95,100,105,99,116,95,95,218,6,117,112,100, 97,116,101,41,3,90,3,110,101,119,90,3,111,108,100,114, 53,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,218,5,95,119,114,97,112,132,1,0,0,115,8, + 0,0,0,218,5,95,119,114,97,112,133,1,0,0,115,8, 0,0,0,0,1,10,1,10,1,22,1,122,26,95,99,104, 101,99,107,95,110,97,109,101,46,60,108,111,99,97,108,115, 62,46,95,119,114,97,112,41,1,78,41,3,218,10,95,98, @@ -540,7 +540,7 @@ const unsigned char _Py_M__importlib_ext 97,109,101,69,114,114,111,114,41,3,114,103,0,0,0,114, 104,0,0,0,114,114,0,0,0,114,4,0,0,0,41,1, 114,103,0,0,0,114,5,0,0,0,218,11,95,99,104,101, - 99,107,95,110,97,109,101,113,1,0,0,115,14,0,0,0, + 99,107,95,110,97,109,101,114,1,0,0,115,14,0,0,0, 0,8,14,7,2,1,10,1,14,2,14,5,10,1,114,117, 0,0,0,99,2,0,0,0,0,0,0,0,5,0,0,0, 4,0,0,0,67,0,0,0,115,60,0,0,0,124,0,106, @@ -568,7 +568,7 @@ const unsigned char _Py_M__importlib_ext 6,108,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,141,1,0,0,115,10,0,0, + 117,108,101,95,115,104,105,109,142,1,0,0,115,10,0,0, 0,0,10,14,1,16,1,4,1,22,1,114,124,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,128,1,0,0,105,0,125,4,124,2, @@ -648,7 +648,7 @@ const unsigned char _Py_M__importlib_ext 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,158,1,0,0,115,76,0,0,0,0,11,4,1,8, + 101,114,159,1,0,0,115,76,0,0,0,0,11,4,1,8, 1,10,3,4,1,8,1,8,1,12,1,12,1,12,1,8, 1,12,1,12,1,12,1,12,1,10,1,12,1,10,1,12, 1,10,1,12,1,8,1,10,1,2,1,16,1,14,1,6, @@ -677,7 +677,7 @@ const unsigned char _Py_M__importlib_ext 54,0,0,0,114,99,0,0,0,114,90,0,0,0,114,91, 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,213,1,0,0,115, + 108,101,95,98,121,116,101,99,111,100,101,214,1,0,0,115, 16,0,0,0,0,2,10,1,10,1,12,1,8,1,12,1, 6,2,12,1,114,142,0,0,0,114,60,0,0,0,99,3, 0,0,0,0,0,0,0,4,0,0,0,3,0,0,0,67, @@ -696,7 +696,7 @@ const unsigned char _Py_M__importlib_ext 4,114,141,0,0,0,114,127,0,0,0,114,135,0,0,0, 114,54,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,225,1,0,0,115,10,0,0,0, + 121,116,101,99,111,100,101,226,1,0,0,115,10,0,0,0, 0,3,8,1,14,1,14,1,16,1,114,145,0,0,0,99, 1,0,0,0,0,0,0,0,5,0,0,0,4,0,0,0, 67,0,0,0,115,62,0,0,0,100,1,100,2,108,0,125, @@ -723,7 +723,7 @@ const unsigned char _Py_M__importlib_ext 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,235,1,0,0,115,10,0,0, + 101,95,115,111,117,114,99,101,236,1,0,0,115,10,0,0, 0,0,5,8,1,12,1,10,1,12,1,114,150,0,0,0, 41,2,114,121,0,0,0,218,26,115,117,98,109,111,100,117, 108,101,95,115,101,97,114,99,104,95,108,111,99,97,116,105, @@ -783,7 +783,7 @@ const unsigned char _Py_M__importlib_ext 102,105,120,101,115,114,154,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,218,23,115,112,101,99,95,102,114,111,109,95,102,105, - 108,101,95,108,111,99,97,116,105,111,110,252,1,0,0,115, + 108,101,95,108,111,99,97,116,105,111,110,253,1,0,0,115, 60,0,0,0,0,12,8,4,4,1,10,2,2,1,14,1, 14,1,6,8,18,1,6,3,8,1,16,1,14,1,10,1, 6,1,6,2,4,3,8,2,10,1,2,1,14,1,14,1, @@ -820,7 +820,7 @@ const unsigned char _Py_M__importlib_ext 95,77,65,67,72,73,78,69,41,2,218,3,99,108,115,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,74,2,0,0,115,8,0,0,0,0,2,2,1, + 116,114,121,75,2,0,0,115,8,0,0,0,0,2,2,1, 14,1,14,1,122,36,87,105,110,100,111,119,115,82,101,103, 105,115,116,114,121,70,105,110,100,101,114,46,95,111,112,101, 110,95,114,101,103,105,115,116,114,121,99,2,0,0,0,0, @@ -846,7 +846,7 @@ const unsigned char _Py_M__importlib_ext 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,81,2,0,0,115,22,0,0,0,0,2,6,1,8, + 114,121,82,2,0,0,115,22,0,0,0,0,2,6,1,8, 2,6,1,10,1,22,1,2,1,12,1,26,1,14,1,6, 1,122,38,87,105,110,100,111,119,115,82,101,103,105,115,116, 114,121,70,105,110,100,101,114,46,95,115,101,97,114,99,104, @@ -868,7 +868,7 @@ const unsigned char _Py_M__importlib_ext 116,97,114,103,101,116,114,172,0,0,0,114,121,0,0,0, 114,161,0,0,0,114,159,0,0,0,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,96,2,0,0,115,26,0,0,0,0,2,10, + 115,112,101,99,97,2,0,0,115,26,0,0,0,0,2,10, 1,8,1,4,1,2,1,12,1,14,1,6,1,16,1,14, 1,6,1,10,1,8,1,122,31,87,105,110,100,111,119,115, 82,101,103,105,115,116,114,121,70,105,110,100,101,114,46,102, @@ -887,7 +887,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,41,4,114,165,0,0,0,114,120,0,0,0,114, 35,0,0,0,114,159,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,112,2,0,0,115,8,0,0,0,0,7, + 111,100,117,108,101,113,2,0,0,115,8,0,0,0,0,7, 12,1,8,1,8,2,122,33,87,105,110,100,111,119,115,82, 101,103,105,115,116,114,121,70,105,110,100,101,114,46,102,105, 110,100,95,109,111,100,117,108,101,41,2,78,78,41,1,78, @@ -896,7 +896,7 @@ const unsigned char _Py_M__importlib_ext 114,168,0,0,0,218,11,99,108,97,115,115,109,101,116,104, 111,100,114,167,0,0,0,114,173,0,0,0,114,176,0,0, 0,114,177,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,163,0,0,0,62, + 114,4,0,0,0,114,5,0,0,0,114,163,0,0,0,63, 2,0,0,115,20,0,0,0,8,2,4,3,4,3,4,2, 4,2,12,7,12,15,2,1,12,15,2,1,114,163,0,0, 0,99,0,0,0,0,0,0,0,0,0,0,0,0,2,0, @@ -931,7 +931,7 @@ const unsigned char _Py_M__importlib_ext 41,5,114,101,0,0,0,114,120,0,0,0,114,95,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,154,0,0,0,131, + 114,4,0,0,0,114,5,0,0,0,114,154,0,0,0,132, 2,0,0,115,8,0,0,0,0,3,18,1,16,1,14,1, 122,24,95,76,111,97,100,101,114,66,97,115,105,99,115,46, 105,115,95,112,97,99,107,97,103,101,99,2,0,0,0,0, @@ -942,7 +942,7 @@ const unsigned char _Py_M__importlib_ext 97,116,105,111,110,46,78,114,4,0,0,0,41,2,114,101, 0,0,0,114,159,0,0,0,114,4,0,0,0,114,4,0, 0,0,114,5,0,0,0,218,13,99,114,101,97,116,101,95, - 109,111,100,117,108,101,139,2,0,0,115,0,0,0,0,122, + 109,111,100,117,108,101,140,2,0,0,115,0,0,0,0,122, 27,95,76,111,97,100,101,114,66,97,115,105,99,115,46,99, 114,101,97,116,101,95,109,111,100,117,108,101,99,2,0,0, 0,0,0,0,0,3,0,0,0,4,0,0,0,67,0,0, @@ -962,7 +962,7 @@ const unsigned char _Py_M__importlib_ext 0,0,41,3,114,101,0,0,0,218,6,109,111,100,117,108, 101,114,141,0,0,0,114,4,0,0,0,114,4,0,0,0, 114,5,0,0,0,218,11,101,120,101,99,95,109,111,100,117, - 108,101,142,2,0,0,115,10,0,0,0,0,2,12,1,8, + 108,101,143,2,0,0,115,10,0,0,0,0,2,12,1,8, 1,6,1,10,1,122,25,95,76,111,97,100,101,114,66,97, 115,105,99,115,46,101,120,101,99,95,109,111,100,117,108,101, 99,2,0,0,0,0,0,0,0,2,0,0,0,3,0,0, @@ -973,14 +973,14 @@ const unsigned char _Py_M__importlib_ext 97,100,95,109,111,100,117,108,101,95,115,104,105,109,41,2, 114,101,0,0,0,114,120,0,0,0,114,4,0,0,0,114, 4,0,0,0,114,5,0,0,0,218,11,108,111,97,100,95, - 109,111,100,117,108,101,150,2,0,0,115,2,0,0,0,0, + 109,111,100,117,108,101,151,2,0,0,115,2,0,0,0,0, 2,122,25,95,76,111,97,100,101,114,66,97,115,105,99,115, 46,108,111,97,100,95,109,111,100,117,108,101,78,41,8,114, 106,0,0,0,114,105,0,0,0,114,107,0,0,0,114,108, 0,0,0,114,154,0,0,0,114,181,0,0,0,114,186,0, 0,0,114,188,0,0,0,114,4,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,179,0,0,0, - 126,2,0,0,115,10,0,0,0,8,3,4,2,8,8,8, + 127,2,0,0,115,10,0,0,0,8,3,4,2,8,8,8, 3,8,8,114,179,0,0,0,99,0,0,0,0,0,0,0, 0,0,0,0,0,3,0,0,0,64,0,0,0,115,74,0, 0,0,101,0,90,1,100,0,90,2,100,1,100,2,132,0, @@ -1005,7 +1005,7 @@ const unsigned char _Py_M__importlib_ext 32,32,32,32,78,41,1,218,7,73,79,69,114,114,111,114, 41,2,114,101,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,157,2,0,0,115,2,0,0,0, + 104,95,109,116,105,109,101,158,2,0,0,115,2,0,0,0, 0,6,122,23,83,111,117,114,99,101,76,111,97,100,101,114, 46,112,97,116,104,95,109,116,105,109,101,99,2,0,0,0, 0,0,0,0,2,0,0,0,3,0,0,0,67,0,0,0, @@ -1040,7 +1040,7 @@ const unsigned char _Py_M__importlib_ext 32,32,32,32,114,127,0,0,0,41,1,114,191,0,0,0, 41,2,114,101,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,165,2,0,0,115,2,0,0,0, + 104,95,115,116,97,116,115,166,2,0,0,115,2,0,0,0, 0,11,122,23,83,111,117,114,99,101,76,111,97,100,101,114, 46,112,97,116,104,95,115,116,97,116,115,99,4,0,0,0, 0,0,0,0,4,0,0,0,3,0,0,0,67,0,0,0, @@ -1064,7 +1064,7 @@ const unsigned char _Py_M__importlib_ext 0,90,10,99,97,99,104,101,95,112,97,116,104,114,54,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,178,2,0,0,115,2,0,0,0,0,8,122,28,83, + 100,101,179,2,0,0,115,2,0,0,0,0,8,122,28,83, 111,117,114,99,101,76,111,97,100,101,114,46,95,99,97,99, 104,101,95,98,121,116,101,99,111,100,101,99,3,0,0,0, 0,0,0,0,3,0,0,0,1,0,0,0,67,0,0,0, @@ -1080,7 +1080,7 @@ const unsigned char _Py_M__importlib_ext 111,100,101,32,102,105,108,101,115,46,10,32,32,32,32,32, 32,32,32,78,114,4,0,0,0,41,3,114,101,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,193,0,0,0,188,2, + 4,0,0,0,114,5,0,0,0,114,193,0,0,0,189,2, 0,0,115,0,0,0,0,122,21,83,111,117,114,99,101,76, 111,97,100,101,114,46,115,101,116,95,100,97,116,97,99,2, 0,0,0,0,0,0,0,5,0,0,0,16,0,0,0,67, @@ -1101,7 +1101,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,41,5,114,101,0,0,0,114,120,0,0,0,114, 35,0,0,0,114,148,0,0,0,218,3,101,120,99,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,195,2,0,0,115,14,0, + 101,116,95,115,111,117,114,99,101,196,2,0,0,115,14,0, 0,0,0,2,10,1,2,1,14,1,16,1,6,1,28,1, 122,23,83,111,117,114,99,101,76,111,97,100,101,114,46,103, 101,116,95,115,111,117,114,99,101,114,29,0,0,0,41,1, @@ -1123,7 +1123,7 @@ const unsigned char _Py_M__importlib_ext 105,108,101,41,4,114,101,0,0,0,114,54,0,0,0,114, 35,0,0,0,114,198,0,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,205,2,0,0,115,4,0,0, + 95,116,111,95,99,111,100,101,206,2,0,0,115,4,0,0, 0,0,5,14,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,0,0,0,43, @@ -1180,7 +1180,7 @@ const unsigned char _Py_M__importlib_ext 0,218,10,98,121,116,101,115,95,100,97,116,97,114,148,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,182, - 0,0,0,213,2,0,0,115,78,0,0,0,0,7,10,1, + 0,0,0,214,2,0,0,115,78,0,0,0,0,7,10,1, 4,1,2,1,12,1,14,1,10,2,2,1,14,1,14,1, 6,2,12,1,2,1,14,1,14,1,6,2,2,1,6,1, 8,1,12,1,18,1,6,2,8,1,6,1,10,1,4,1, @@ -1192,7 +1192,7 @@ const unsigned char _Py_M__importlib_ext 0,0,114,194,0,0,0,114,193,0,0,0,114,197,0,0, 0,114,201,0,0,0,114,182,0,0,0,114,4,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 189,0,0,0,155,2,0,0,115,14,0,0,0,8,2,8, + 189,0,0,0,156,2,0,0,115,14,0,0,0,8,2,8, 8,8,13,8,10,8,7,8,10,14,8,114,189,0,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0, 0,0,0,0,0,115,76,0,0,0,101,0,90,1,100,0, @@ -1218,7 +1218,7 @@ const unsigned char _Py_M__importlib_ext 105,110,100,101,114,46,78,41,2,114,99,0,0,0,114,35, 0,0,0,41,3,114,101,0,0,0,114,120,0,0,0,114, 35,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,180,0,0,0,14,3,0,0,115,4,0,0, + 0,0,0,114,180,0,0,0,15,3,0,0,115,4,0,0, 0,0,3,6,1,122,19,70,105,108,101,76,111,97,100,101, 114,46,95,95,105,110,105,116,95,95,99,2,0,0,0,0, 0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115, @@ -1227,7 +1227,7 @@ const unsigned char _Py_M__importlib_ext 2,218,9,95,95,99,108,97,115,115,95,95,114,112,0,0, 0,41,2,114,101,0,0,0,218,5,111,116,104,101,114,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,218,6, - 95,95,101,113,95,95,20,3,0,0,115,4,0,0,0,0, + 95,95,101,113,95,95,21,3,0,0,115,4,0,0,0,0, 1,12,1,122,17,70,105,108,101,76,111,97,100,101,114,46, 95,95,101,113,95,95,99,1,0,0,0,0,0,0,0,1, 0,0,0,3,0,0,0,67,0,0,0,115,20,0,0,0, @@ -1235,7 +1235,7 @@ const unsigned char _Py_M__importlib_ext 65,0,83,0,41,1,78,41,3,218,4,104,97,115,104,114, 99,0,0,0,114,35,0,0,0,41,1,114,101,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,24,3,0,0,115,2,0, + 8,95,95,104,97,115,104,95,95,25,3,0,0,115,2,0, 0,0,0,1,122,19,70,105,108,101,76,111,97,100,101,114, 46,95,95,104,97,115,104,95,95,99,2,0,0,0,0,0, 0,0,2,0,0,0,3,0,0,0,3,0,0,0,115,16, @@ -1250,7 +1250,7 @@ const unsigned char _Py_M__importlib_ext 117,112,101,114,114,205,0,0,0,114,188,0,0,0,41,2, 114,101,0,0,0,114,120,0,0,0,41,1,114,206,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,188,0,0,0, - 27,3,0,0,115,2,0,0,0,0,10,122,22,70,105,108, + 28,3,0,0,115,2,0,0,0,0,10,122,22,70,105,108, 101,76,111,97,100,101,114,46,108,111,97,100,95,109,111,100, 117,108,101,99,2,0,0,0,0,0,0,0,2,0,0,0, 1,0,0,0,67,0,0,0,115,6,0,0,0,124,0,106, @@ -1260,7 +1260,7 @@ const unsigned char _Py_M__importlib_ext 110,100,32,98,121,32,116,104,101,32,102,105,110,100,101,114, 46,41,1,114,35,0,0,0,41,2,114,101,0,0,0,114, 120,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,152,0,0,0,39,3,0,0,115,2,0,0, + 0,0,0,114,152,0,0,0,40,3,0,0,115,2,0,0, 0,0,3,122,23,70,105,108,101,76,111,97,100,101,114,46, 103,101,116,95,102,105,108,101,110,97,109,101,99,2,0,0, 0,0,0,0,0,3,0,0,0,9,0,0,0,67,0,0, @@ -1272,7 +1272,7 @@ const unsigned char _Py_M__importlib_ext 46,218,1,114,78,41,3,114,50,0,0,0,114,51,0,0, 0,90,4,114,101,97,100,41,3,114,101,0,0,0,114,35, 0,0,0,114,55,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,195,0,0,0,44,3,0,0, + 0,0,114,5,0,0,0,114,195,0,0,0,45,3,0,0, 115,4,0,0,0,0,2,14,1,122,19,70,105,108,101,76, 111,97,100,101,114,46,103,101,116,95,100,97,116,97,41,11, 114,106,0,0,0,114,105,0,0,0,114,107,0,0,0,114, @@ -1280,7 +1280,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,117,0,0,0,114,188,0,0,0,114,152,0, 0,0,114,195,0,0,0,114,4,0,0,0,114,4,0,0, 0,41,1,114,206,0,0,0,114,5,0,0,0,114,205,0, - 0,0,9,3,0,0,115,14,0,0,0,8,3,4,2,8, + 0,0,10,3,0,0,115,14,0,0,0,8,3,4,2,8, 6,8,4,8,3,16,12,12,5,114,205,0,0,0,99,0, 0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64, 0,0,0,115,46,0,0,0,101,0,90,1,100,0,90,2, @@ -1301,7 +1301,7 @@ const unsigned char _Py_M__importlib_ext 114,39,0,0,0,218,8,115,116,95,109,116,105,109,101,90, 7,115,116,95,115,105,122,101,41,3,114,101,0,0,0,114, 35,0,0,0,114,203,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,192,0,0,0,54,3,0, + 0,0,0,114,5,0,0,0,114,192,0,0,0,55,3,0, 0,115,4,0,0,0,0,2,8,1,122,27,83,111,117,114, 99,101,70,105,108,101,76,111,97,100,101,114,46,112,97,116, 104,95,115,116,97,116,115,99,4,0,0,0,0,0,0,0, @@ -1312,7 +1312,7 @@ const unsigned char _Py_M__importlib_ext 0,41,5,114,101,0,0,0,114,91,0,0,0,114,90,0, 0,0,114,54,0,0,0,114,42,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,194,0,0,0, - 59,3,0,0,115,4,0,0,0,0,2,8,1,122,32,83, + 60,3,0,0,115,4,0,0,0,0,2,8,1,122,32,83, 111,117,114,99,101,70,105,108,101,76,111,97,100,101,114,46, 95,99,97,99,104,101,95,98,121,116,101,99,111,100,101,105, 182,1,0,0,41,1,114,215,0,0,0,99,3,0,0,0, @@ -1346,7 +1346,7 @@ const unsigned char _Py_M__importlib_ext 0,0,114,54,0,0,0,114,215,0,0,0,218,6,112,97, 114,101,110,116,114,95,0,0,0,114,27,0,0,0,114,23, 0,0,0,114,196,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,193,0,0,0,64,3,0,0, + 0,0,114,5,0,0,0,114,193,0,0,0,65,3,0,0, 115,42,0,0,0,0,2,12,1,4,2,16,1,12,1,14, 2,14,1,10,1,2,1,14,1,14,2,6,1,16,3,6, 1,8,1,20,1,2,1,12,1,16,1,16,2,8,1,122, @@ -1355,7 +1355,7 @@ const unsigned char _Py_M__importlib_ext 0,0,114,105,0,0,0,114,107,0,0,0,114,108,0,0, 0,114,192,0,0,0,114,194,0,0,0,114,193,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,213,0,0,0,50,3,0,0,115,8,0, + 5,0,0,0,114,213,0,0,0,51,3,0,0,115,8,0, 0,0,8,2,4,2,8,5,8,5,114,213,0,0,0,99, 0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0, 64,0,0,0,115,32,0,0,0,101,0,90,1,100,0,90, @@ -1375,7 +1375,7 @@ const unsigned char _Py_M__importlib_ext 114,136,0,0,0,114,142,0,0,0,41,5,114,101,0,0, 0,114,120,0,0,0,114,35,0,0,0,114,54,0,0,0, 114,204,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 5,0,0,0,114,182,0,0,0,99,3,0,0,115,8,0, + 5,0,0,0,114,182,0,0,0,100,3,0,0,115,8,0, 0,0,0,1,10,1,10,1,18,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, @@ -1385,13 +1385,13 @@ const unsigned char _Py_M__importlib_ext 105,115,32,110,111,32,115,111,117,114,99,101,32,99,111,100, 101,46,78,114,4,0,0,0,41,2,114,101,0,0,0,114, 120,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,197,0,0,0,105,3,0,0,115,2,0,0, + 0,0,0,114,197,0,0,0,106,3,0,0,115,2,0,0, 0,0,2,122,31,83,111,117,114,99,101,108,101,115,115,70, 105,108,101,76,111,97,100,101,114,46,103,101,116,95,115,111, 117,114,99,101,78,41,6,114,106,0,0,0,114,105,0,0, 0,114,107,0,0,0,114,108,0,0,0,114,182,0,0,0, 114,197,0,0,0,114,4,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,5,0,0,0,114,218,0,0,0,95,3, + 4,0,0,0,114,5,0,0,0,114,218,0,0,0,96,3, 0,0,115,6,0,0,0,8,2,4,2,8,6,114,218,0, 0,0,99,0,0,0,0,0,0,0,0,0,0,0,0,3, 0,0,0,64,0,0,0,115,92,0,0,0,101,0,90,1, @@ -1413,7 +1413,7 @@ const unsigned char _Py_M__importlib_ext 124,0,95,1,100,0,83,0,41,1,78,41,2,114,99,0, 0,0,114,35,0,0,0,41,3,114,101,0,0,0,114,99, 0,0,0,114,35,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,180,0,0,0,122,3,0,0, + 0,0,114,5,0,0,0,114,180,0,0,0,123,3,0,0, 115,4,0,0,0,0,1,6,1,122,28,69,120,116,101,110, 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,95, 95,105,110,105,116,95,95,99,2,0,0,0,0,0,0,0, @@ -1422,7 +1422,7 @@ const unsigned char _Py_M__importlib_ext 1,124,1,106,1,107,2,83,0,41,1,78,41,2,114,206, 0,0,0,114,112,0,0,0,41,2,114,101,0,0,0,114, 207,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,208,0,0,0,126,3,0,0,115,4,0,0, + 0,0,0,114,208,0,0,0,127,3,0,0,115,4,0,0, 0,0,1,12,1,122,26,69,120,116,101,110,115,105,111,110, 70,105,108,101,76,111,97,100,101,114,46,95,95,101,113,95, 95,99,1,0,0,0,0,0,0,0,1,0,0,0,3,0, @@ -1430,7 +1430,7 @@ const unsigned char _Py_M__importlib_ext 1,131,1,116,0,124,0,106,2,131,1,65,0,83,0,41, 1,78,41,3,114,209,0,0,0,114,99,0,0,0,114,35, 0,0,0,41,1,114,101,0,0,0,114,4,0,0,0,114, - 4,0,0,0,114,5,0,0,0,114,210,0,0,0,130,3, + 4,0,0,0,114,5,0,0,0,114,210,0,0,0,131,3, 0,0,115,2,0,0,0,0,1,122,28,69,120,116,101,110, 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,95, 95,104,97,115,104,95,95,99,2,0,0,0,0,0,0,0, @@ -1447,7 +1447,7 @@ const unsigned char _Py_M__importlib_ext 95,100,121,110,97,109,105,99,114,130,0,0,0,114,99,0, 0,0,114,35,0,0,0,41,3,114,101,0,0,0,114,159, 0,0,0,114,185,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,181,0,0,0,133,3,0,0, + 0,0,114,5,0,0,0,114,181,0,0,0,134,3,0,0, 115,10,0,0,0,0,2,4,1,10,1,6,1,12,1,122, 33,69,120,116,101,110,115,105,111,110,70,105,108,101,76,111, 97,100,101,114,46,99,114,101,97,116,101,95,109,111,100,117, @@ -1464,7 +1464,7 @@ const unsigned char _Py_M__importlib_ext 101,120,101,99,95,100,121,110,97,109,105,99,114,130,0,0, 0,114,99,0,0,0,114,35,0,0,0,41,2,114,101,0, 0,0,114,185,0,0,0,114,4,0,0,0,114,4,0,0, - 0,114,5,0,0,0,114,186,0,0,0,141,3,0,0,115, + 0,114,5,0,0,0,114,186,0,0,0,142,3,0,0,115, 6,0,0,0,0,2,14,1,6,1,122,31,69,120,116,101, 110,115,105,111,110,70,105,108,101,76,111,97,100,101,114,46, 101,120,101,99,95,109,111,100,117,108,101,99,2,0,0,0, @@ -1482,7 +1482,7 @@ const unsigned char _Py_M__importlib_ext 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,250,9,60,103,101,110, - 101,120,112,114,62,150,3,0,0,115,2,0,0,0,4,1, + 101,120,112,114,62,151,3,0,0,115,2,0,0,0,4,1, 122,49,69,120,116,101,110,115,105,111,110,70,105,108,101,76, 111,97,100,101,114,46,105,115,95,112,97,99,107,97,103,101, 46,60,108,111,99,97,108,115,62,46,60,103,101,110,101,120, @@ -1490,7 +1490,7 @@ const unsigned char _Py_M__importlib_ext 3,97,110,121,218,18,69,88,84,69,78,83,73,79,78,95, 83,85,70,70,73,88,69,83,41,2,114,101,0,0,0,114, 120,0,0,0,114,4,0,0,0,41,1,114,221,0,0,0, - 114,5,0,0,0,114,154,0,0,0,147,3,0,0,115,6, + 114,5,0,0,0,114,154,0,0,0,148,3,0,0,115,6, 0,0,0,0,2,14,1,12,1,122,30,69,120,116,101,110, 115,105,111,110,70,105,108,101,76,111,97,100,101,114,46,105, 115,95,112,97,99,107,97,103,101,99,2,0,0,0,0,0, @@ -1502,7 +1502,7 @@ const unsigned char _Py_M__importlib_ext 100,101,32,111,98,106,101,99,116,46,78,114,4,0,0,0, 41,2,114,101,0,0,0,114,120,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,182,0,0,0, - 153,3,0,0,115,2,0,0,0,0,2,122,28,69,120,116, + 154,3,0,0,115,2,0,0,0,0,2,122,28,69,120,116, 101,110,115,105,111,110,70,105,108,101,76,111,97,100,101,114, 46,103,101,116,95,99,111,100,101,99,2,0,0,0,0,0, 0,0,2,0,0,0,1,0,0,0,67,0,0,0,115,4, @@ -1512,7 +1512,7 @@ const unsigned char _Py_M__importlib_ext 32,110,111,32,115,111,117,114,99,101,32,99,111,100,101,46, 78,114,4,0,0,0,41,2,114,101,0,0,0,114,120,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,197,0,0,0,157,3,0,0,115,2,0,0,0,0, + 0,114,197,0,0,0,158,3,0,0,115,2,0,0,0,0, 2,122,30,69,120,116,101,110,115,105,111,110,70,105,108,101, 76,111,97,100,101,114,46,103,101,116,95,115,111,117,114,99, 101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,0, @@ -1523,7 +1523,7 @@ const unsigned char _Py_M__importlib_ext 32,98,121,32,116,104,101,32,102,105,110,100,101,114,46,41, 1,114,35,0,0,0,41,2,114,101,0,0,0,114,120,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,152,0,0,0,161,3,0,0,115,2,0,0,0,0, + 0,114,152,0,0,0,162,3,0,0,115,2,0,0,0,0, 3,122,32,69,120,116,101,110,115,105,111,110,70,105,108,101, 76,111,97,100,101,114,46,103,101,116,95,102,105,108,101,110, 97,109,101,78,41,14,114,106,0,0,0,114,105,0,0,0, @@ -1532,7 +1532,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,154,0,0,0,114,182,0,0,0,114,197,0, 0,0,114,117,0,0,0,114,152,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 114,219,0,0,0,114,3,0,0,115,20,0,0,0,8,6, + 114,219,0,0,0,115,3,0,0,115,20,0,0,0,8,6, 4,2,8,4,8,4,8,3,8,8,8,6,8,6,8,4, 8,4,114,219,0,0,0,99,0,0,0,0,0,0,0,0, 0,0,0,0,2,0,0,0,64,0,0,0,115,96,0,0, @@ -1573,7 +1573,7 @@ const unsigned char _Py_M__importlib_ext 95,102,105,110,100,101,114,41,4,114,101,0,0,0,114,99, 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,180,0,0,0,174,3,0,0,115,8,0, + 5,0,0,0,114,180,0,0,0,175,3,0,0,115,8,0, 0,0,0,1,6,1,6,1,14,1,122,23,95,78,97,109, 101,115,112,97,99,101,80,97,116,104,46,95,95,105,110,105, 116,95,95,99,1,0,0,0,0,0,0,0,4,0,0,0, @@ -1591,7 +1591,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,217,0,0,0,218,3,100,111,116,90,2,109, 101,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,180,3,0,0,115,8,0, + 97,116,104,95,110,97,109,101,115,181,3,0,0,115,8,0, 0,0,0,2,18,1,8,2,4,3,122,38,95,78,97,109, 101,115,112,97,99,101,80,97,116,104,46,95,102,105,110,100, 95,112,97,114,101,110,116,95,112,97,116,104,95,110,97,109, @@ -1604,7 +1604,7 @@ const unsigned char _Py_M__importlib_ext 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, - 228,0,0,0,190,3,0,0,115,4,0,0,0,0,1,12, + 228,0,0,0,191,3,0,0,115,4,0,0,0,0,1,12, 1,122,31,95,78,97,109,101,115,112,97,99,101,80,97,116, 104,46,95,103,101,116,95,112,97,114,101,110,116,95,112,97, 116,104,99,1,0,0,0,0,0,0,0,3,0,0,0,3, @@ -1619,7 +1619,7 @@ const unsigned char _Py_M__importlib_ext 151,0,0,0,114,227,0,0,0,41,3,114,101,0,0,0, 90,11,112,97,114,101,110,116,95,112,97,116,104,114,159,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,194, + 0,218,12,95,114,101,99,97,108,99,117,108,97,116,101,195, 3,0,0,115,16,0,0,0,0,2,12,1,10,1,14,3, 18,1,6,1,8,1,6,1,122,27,95,78,97,109,101,115, 112,97,99,101,80,97,116,104,46,95,114,101,99,97,108,99, @@ -1628,7 +1628,7 @@ const unsigned char _Py_M__importlib_ext 0,124,0,106,1,131,0,131,1,83,0,41,1,78,41,2, 218,4,105,116,101,114,114,235,0,0,0,41,1,114,101,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,207,3,0,0,115, + 0,218,8,95,95,105,116,101,114,95,95,208,3,0,0,115, 2,0,0,0,0,1,122,23,95,78,97,109,101,115,112,97, 99,101,80,97,116,104,46,95,95,105,116,101,114,95,95,99, 3,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, @@ -1637,14 +1637,14 @@ const unsigned char _Py_M__importlib_ext 0,41,3,114,101,0,0,0,218,5,105,110,100,101,120,114, 35,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, 0,0,0,218,11,95,95,115,101,116,105,116,101,109,95,95, - 210,3,0,0,115,2,0,0,0,0,1,122,26,95,78,97, + 211,3,0,0,115,2,0,0,0,0,1,122,26,95,78,97, 109,101,115,112,97,99,101,80,97,116,104,46,95,95,115,101, 116,105,116,101,109,95,95,99,1,0,0,0,0,0,0,0, 1,0,0,0,2,0,0,0,67,0,0,0,115,12,0,0, 0,116,0,124,0,106,1,131,0,131,1,83,0,41,1,78, 41,2,114,31,0,0,0,114,235,0,0,0,41,1,114,101, 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,213,3,0,0,115, + 0,0,218,7,95,95,108,101,110,95,95,214,3,0,0,115, 2,0,0,0,0,1,122,22,95,78,97,109,101,115,112,97, 99,101,80,97,116,104,46,95,95,108,101,110,95,95,99,1, 0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,67, @@ -1653,7 +1653,7 @@ const unsigned char _Py_M__importlib_ext 97,99,101,80,97,116,104,40,123,33,114,125,41,41,2,114, 48,0,0,0,114,227,0,0,0,41,1,114,101,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,218, - 8,95,95,114,101,112,114,95,95,216,3,0,0,115,2,0, + 8,95,95,114,101,112,114,95,95,217,3,0,0,115,2,0, 0,0,0,1,122,23,95,78,97,109,101,115,112,97,99,101, 80,97,116,104,46,95,95,114,101,112,114,95,95,99,2,0, 0,0,0,0,0,0,2,0,0,0,2,0,0,0,67,0, @@ -1661,7 +1661,7 @@ const unsigned char _Py_M__importlib_ext 6,83,0,41,1,78,41,1,114,235,0,0,0,41,2,114, 101,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,219,3,0,0,115,2,0,0,0, + 116,97,105,110,115,95,95,220,3,0,0,115,2,0,0,0, 0,1,122,27,95,78,97,109,101,115,112,97,99,101,80,97, 116,104,46,95,95,99,111,110,116,97,105,110,115,95,95,99, 2,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0, @@ -1669,7 +1669,7 @@ const unsigned char _Py_M__importlib_ext 1,131,1,1,0,100,0,83,0,41,1,78,41,2,114,227, 0,0,0,114,158,0,0,0,41,2,114,101,0,0,0,114, 242,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,158,0,0,0,222,3,0,0,115,2,0,0, + 0,0,0,114,158,0,0,0,223,3,0,0,115,2,0,0, 0,0,1,122,21,95,78,97,109,101,115,112,97,99,101,80, 97,116,104,46,97,112,112,101,110,100,78,41,14,114,106,0, 0,0,114,105,0,0,0,114,107,0,0,0,114,108,0,0, @@ -1677,7 +1677,7 @@ const unsigned char _Py_M__importlib_ext 114,235,0,0,0,114,237,0,0,0,114,239,0,0,0,114, 240,0,0,0,114,241,0,0,0,114,243,0,0,0,114,158, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,225,0,0,0,167,3,0,0, + 0,0,114,5,0,0,0,114,225,0,0,0,168,3,0,0, 115,22,0,0,0,8,5,4,2,8,6,8,10,8,4,8, 13,8,3,8,3,8,3,8,3,8,3,114,225,0,0,0, 99,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0, @@ -1694,7 +1694,7 @@ const unsigned char _Py_M__importlib_ext 225,0,0,0,114,227,0,0,0,41,4,114,101,0,0,0, 114,99,0,0,0,114,35,0,0,0,114,231,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,180, - 0,0,0,228,3,0,0,115,2,0,0,0,0,1,122,25, + 0,0,0,229,3,0,0,115,2,0,0,0,0,1,122,25, 95,78,97,109,101,115,112,97,99,101,76,111,97,100,101,114, 46,95,95,105,110,105,116,95,95,99,2,0,0,0,0,0, 0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,12, @@ -1711,21 +1711,21 @@ const unsigned char _Py_M__importlib_ext 62,41,2,114,48,0,0,0,114,106,0,0,0,41,2,114, 165,0,0,0,114,185,0,0,0,114,4,0,0,0,114,4, 0,0,0,114,5,0,0,0,218,11,109,111,100,117,108,101, - 95,114,101,112,114,231,3,0,0,115,2,0,0,0,0,7, + 95,114,101,112,114,232,3,0,0,115,2,0,0,0,0,7, 122,28,95,78,97,109,101,115,112,97,99,101,76,111,97,100, 101,114,46,109,111,100,117,108,101,95,114,101,112,114,99,2, 0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,67, 0,0,0,115,4,0,0,0,100,1,83,0,41,2,78,84, 114,4,0,0,0,41,2,114,101,0,0,0,114,120,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,5,0,0,0, - 114,154,0,0,0,240,3,0,0,115,2,0,0,0,0,1, + 114,154,0,0,0,241,3,0,0,115,2,0,0,0,0,1, 122,27,95,78,97,109,101,115,112,97,99,101,76,111,97,100, 101,114,46,105,115,95,112,97,99,107,97,103,101,99,2,0, 0,0,0,0,0,0,2,0,0,0,1,0,0,0,67,0, 0,0,115,4,0,0,0,100,1,83,0,41,2,78,114,30, 0,0,0,114,4,0,0,0,41,2,114,101,0,0,0,114, 120,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,197,0,0,0,243,3,0,0,115,2,0,0, + 0,0,0,114,197,0,0,0,244,3,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,0,0, @@ -1735,7 +1735,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,199,0,0,0,84,41,1,114,200,0,0,0, 41,2,114,101,0,0,0,114,120,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,182,0,0,0, - 246,3,0,0,115,2,0,0,0,0,1,122,25,95,78,97, + 247,3,0,0,115,2,0,0,0,0,1,122,25,95,78,97, 109,101,115,112,97,99,101,76,111,97,100,101,114,46,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, @@ -1744,14 +1744,14 @@ const unsigned char _Py_M__importlib_ext 114,32,109,111,100,117,108,101,32,99,114,101,97,116,105,111, 110,46,78,114,4,0,0,0,41,2,114,101,0,0,0,114, 159,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,181,0,0,0,249,3,0,0,115,0,0,0, + 0,0,0,114,181,0,0,0,250,3,0,0,115,0,0,0, 0,122,30,95,78,97,109,101,115,112,97,99,101,76,111,97, 100,101,114,46,99,114,101,97,116,101,95,109,111,100,117,108, 101,99,2,0,0,0,0,0,0,0,2,0,0,0,1,0, 0,0,67,0,0,0,115,4,0,0,0,100,0,83,0,41, 1,78,114,4,0,0,0,41,2,114,101,0,0,0,114,185, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,186,0,0,0,252,3,0,0,115,2,0,0,0, + 0,0,114,186,0,0,0,253,3,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, @@ -1769,7 +1769,7 @@ const unsigned char _Py_M__importlib_ext 114,125,41,4,114,115,0,0,0,114,130,0,0,0,114,227, 0,0,0,114,187,0,0,0,41,2,114,101,0,0,0,114, 120,0,0,0,114,4,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,188,0,0,0,255,3,0,0,115,6,0,0, + 0,0,0,114,188,0,0,0,0,4,0,0,115,6,0,0, 0,0,7,6,1,8,1,122,28,95,78,97,109,101,115,112, 97,99,101,76,111,97,100,101,114,46,108,111,97,100,95,109, 111,100,117,108,101,78,41,12,114,106,0,0,0,114,105,0, @@ -1777,7 +1777,7 @@ const unsigned char _Py_M__importlib_ext 0,114,245,0,0,0,114,154,0,0,0,114,197,0,0,0, 114,182,0,0,0,114,181,0,0,0,114,186,0,0,0,114, 188,0,0,0,114,4,0,0,0,114,4,0,0,0,114,4, - 0,0,0,114,5,0,0,0,114,244,0,0,0,227,3,0, + 0,0,0,114,5,0,0,0,114,244,0,0,0,228,3,0, 0,115,16,0,0,0,8,1,8,3,12,9,8,3,8,3, 8,3,8,3,8,3,114,244,0,0,0,99,0,0,0,0, 0,0,0,0,0,0,0,0,4,0,0,0,64,0,0,0, @@ -1811,7 +1811,7 @@ const unsigned char _Py_M__importlib_ext 104,101,218,6,118,97,108,117,101,115,114,109,0,0,0,114, 247,0,0,0,41,2,114,165,0,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,247,0,0,0,17,4,0,0,115,6,0,0,0, + 0,0,114,247,0,0,0,18,4,0,0,115,6,0,0,0, 0,4,16,1,10,1,122,28,80,97,116,104,70,105,110,100, 101,114,46,105,110,118,97,108,105,100,97,116,101,95,99,97, 99,104,101,115,99,2,0,0,0,0,0,0,0,3,0,0, @@ -1831,7 +1831,7 @@ const unsigned char _Py_M__importlib_ext 0,0,114,100,0,0,0,41,3,114,165,0,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,25,4,0,0,115,16,0,0,0,0,3, + 104,111,111,107,115,26,4,0,0,115,16,0,0,0,0,3, 18,1,12,1,12,1,2,1,8,1,14,1,12,2,122,22, 80,97,116,104,70,105,110,100,101,114,46,95,112,97,116,104, 95,104,111,111,107,115,99,2,0,0,0,0,0,0,0,3, @@ -1862,7 +1862,7 @@ const unsigned char _Py_M__importlib_ext 114,252,0,0,0,41,3,114,165,0,0,0,114,35,0,0, 0,114,250,0,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,38,4,0,0,115, + 111,114,116,101,114,95,99,97,99,104,101,39,4,0,0,115, 22,0,0,0,0,8,8,1,2,1,12,1,14,3,6,1, 2,1,14,1,14,1,10,1,16,1,122,31,80,97,116,104, 70,105,110,100,101,114,46,95,112,97,116,104,95,105,109,112, @@ -1880,7 +1880,7 @@ const unsigned char _Py_M__importlib_ext 114,250,0,0,0,114,121,0,0,0,114,122,0,0,0,114, 159,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,60,4,0,0,115,18,0,0,0,0,4, + 95,115,112,101,99,61,4,0,0,115,18,0,0,0,0,4, 10,1,16,2,10,1,4,1,8,1,12,1,12,1,6,1, 122,27,80,97,116,104,70,105,110,100,101,114,46,95,108,101, 103,97,99,121,95,103,101,116,95,115,112,101,99,78,99,4, @@ -1911,7 +1911,7 @@ const unsigned char _Py_M__importlib_ext 101,115,112,97,99,101,95,112,97,116,104,90,5,101,110,116, 114,121,114,250,0,0,0,114,159,0,0,0,114,122,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,75,4,0,0,115, + 218,9,95,103,101,116,95,115,112,101,99,76,4,0,0,115, 40,0,0,0,0,5,4,1,10,1,14,1,2,1,10,1, 8,1,10,1,14,2,12,1,8,1,2,1,10,1,4,1, 6,1,8,1,8,5,14,2,12,1,6,1,122,20,80,97, @@ -1939,7 +1939,7 @@ const unsigned char _Py_M__importlib_ext 0,114,225,0,0,0,41,6,114,165,0,0,0,114,120,0, 0,0,114,35,0,0,0,114,175,0,0,0,114,159,0,0, 0,114,1,1,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,176,0,0,0,107,4,0,0,115,26, + 114,5,0,0,0,114,176,0,0,0,108,4,0,0,115,26, 0,0,0,0,6,8,1,6,1,14,1,8,1,6,1,10, 1,6,1,4,3,6,1,16,1,6,2,6,2,122,20,80, 97,116,104,70,105,110,100,101,114,46,102,105,110,100,95,115, @@ -1961,7 +1961,7 @@ const unsigned char _Py_M__importlib_ext 0,114,121,0,0,0,41,4,114,165,0,0,0,114,120,0, 0,0,114,35,0,0,0,114,159,0,0,0,114,4,0,0, 0,114,4,0,0,0,114,5,0,0,0,114,177,0,0,0, - 131,4,0,0,115,8,0,0,0,0,8,12,1,8,1,4, + 132,4,0,0,115,8,0,0,0,0,8,12,1,8,1,4, 1,122,22,80,97,116,104,70,105,110,100,101,114,46,102,105, 110,100,95,109,111,100,117,108,101,41,1,78,41,2,78,78, 41,1,78,41,12,114,106,0,0,0,114,105,0,0,0,114, @@ -1969,7 +1969,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,252,0,0,0,114,254,0,0,0,114,255,0, 0,0,114,2,1,0,0,114,176,0,0,0,114,177,0,0, 0,114,4,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,5,0,0,0,114,246,0,0,0,13,4,0,0,115,22, + 114,5,0,0,0,114,246,0,0,0,14,4,0,0,115,22, 0,0,0,8,2,4,2,12,8,12,13,12,22,12,15,2, 1,12,31,2,1,12,23,2,1,114,246,0,0,0,99,0, 0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,64, @@ -2013,7 +2013,7 @@ const unsigned char _Py_M__importlib_ext 136,0,102,2,86,0,1,0,113,2,100,0,83,0,41,1, 78,114,4,0,0,0,41,2,114,22,0,0,0,114,220,0, 0,0,41,1,114,121,0,0,0,114,4,0,0,0,114,5, - 0,0,0,114,222,0,0,0,160,4,0,0,115,2,0,0, + 0,0,0,114,222,0,0,0,161,4,0,0,115,2,0,0, 0,4,0,122,38,70,105,108,101,70,105,110,100,101,114,46, 95,95,105,110,105,116,95,95,46,60,108,111,99,97,108,115, 62,46,60,103,101,110,101,120,112,114,62,114,59,0,0,0, @@ -2026,7 +2026,7 @@ const unsigned char _Py_M__importlib_ext 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,161,0,0,0,114, 4,0,0,0,41,1,114,121,0,0,0,114,5,0,0,0, - 114,180,0,0,0,154,4,0,0,115,16,0,0,0,0,4, + 114,180,0,0,0,155,4,0,0,115,16,0,0,0,0,4, 4,1,14,1,28,1,6,2,10,1,6,1,8,1,122,19, 70,105,108,101,70,105,110,100,101,114,46,95,95,105,110,105, 116,95,95,99,1,0,0,0,0,0,0,0,1,0,0,0, @@ -2036,7 +2036,7 @@ const unsigned char _Py_M__importlib_ext 111,114,121,32,109,116,105,109,101,46,114,29,0,0,0,78, 114,88,0,0,0,41,1,114,5,1,0,0,41,1,114,101, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,247,0,0,0,168,4,0,0,115,2,0,0,0, + 0,0,114,247,0,0,0,169,4,0,0,115,2,0,0,0, 0,2,122,28,70,105,108,101,70,105,110,100,101,114,46,105, 110,118,97,108,105,100,97,116,101,95,99,97,99,104,101,115, 99,2,0,0,0,0,0,0,0,3,0,0,0,2,0,0, @@ -2059,7 +2059,7 @@ const unsigned char _Py_M__importlib_ext 114,176,0,0,0,114,121,0,0,0,114,151,0,0,0,41, 3,114,101,0,0,0,114,120,0,0,0,114,159,0,0,0, 114,4,0,0,0,114,4,0,0,0,114,5,0,0,0,114, - 118,0,0,0,174,4,0,0,115,8,0,0,0,0,7,10, + 118,0,0,0,175,4,0,0,115,8,0,0,0,0,7,10, 1,8,1,8,1,122,22,70,105,108,101,70,105,110,100,101, 114,46,102,105,110,100,95,108,111,97,100,101,114,99,6,0, 0,0,0,0,0,0,7,0,0,0,7,0,0,0,67,0, @@ -2070,7 +2070,7 @@ const unsigned char _Py_M__importlib_ext 114,160,0,0,0,114,120,0,0,0,114,35,0,0,0,90, 4,115,109,115,108,114,175,0,0,0,114,121,0,0,0,114, 4,0,0,0,114,4,0,0,0,114,5,0,0,0,114,2, - 1,0,0,186,4,0,0,115,6,0,0,0,0,1,10,1, + 1,0,0,187,4,0,0,115,6,0,0,0,0,1,10,1, 12,1,122,20,70,105,108,101,70,105,110,100,101,114,46,95, 103,101,116,95,115,112,101,99,78,99,3,0,0,0,0,0, 0,0,14,0,0,0,15,0,0,0,67,0,0,0,115,100, @@ -2124,7 +2124,7 @@ const unsigned char _Py_M__importlib_ext 220,0,0,0,114,160,0,0,0,90,13,105,110,105,116,95, 102,105,108,101,110,97,109,101,90,9,102,117,108,108,95,112, 97,116,104,114,159,0,0,0,114,4,0,0,0,114,4,0, - 0,0,114,5,0,0,0,114,176,0,0,0,191,4,0,0, + 0,0,114,5,0,0,0,114,176,0,0,0,192,4,0,0, 115,70,0,0,0,0,5,4,1,14,1,2,1,24,1,14, 1,10,1,10,1,8,1,6,2,6,1,6,1,10,2,6, 1,4,2,8,1,12,1,16,1,8,1,10,1,8,1,24, @@ -2156,7 +2156,7 @@ const unsigned char _Py_M__importlib_ext 113,4,83,0,114,4,0,0,0,41,1,114,89,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,12,5,0,0,115,2,0,0,0,6,0, + 99,111,109,112,62,13,5,0,0,115,2,0,0,0,6,0, 122,41,70,105,108,101,70,105,110,100,101,114,46,95,102,105, 108,108,95,99,97,99,104,101,46,60,108,111,99,97,108,115, 62,46,60,115,101,116,99,111,109,112,62,78,41,18,114,35, @@ -2173,7 +2173,7 @@ const unsigned char _Py_M__importlib_ext 101,110,116,115,114,242,0,0,0,114,99,0,0,0,114,232, 0,0,0,114,220,0,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,10,1,0,0,239,4,0,0,115,34,0,0,0,0, + 0,114,10,1,0,0,240,4,0,0,115,34,0,0,0,0, 2,6,1,2,1,22,1,20,3,10,3,12,1,12,7,6, 1,10,1,16,1,4,1,18,2,4,1,14,1,6,1,12, 1,122,22,70,105,108,101,70,105,110,100,101,114,46,95,102, @@ -2211,7 +2211,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,41,2,114,165,0,0,0,114,9,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,24,5,0,0,115,6,0,0,0,0,2,8,1, + 100,101,114,25,5,0,0,115,6,0,0,0,0,2,8,1, 14,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, @@ -2219,7 +2219,7 @@ const unsigned char _Py_M__importlib_ext 3,114,165,0,0,0,114,9,1,0,0,114,15,1,0,0, 114,4,0,0,0,41,2,114,165,0,0,0,114,9,1,0, 0,114,5,0,0,0,218,9,112,97,116,104,95,104,111,111, - 107,14,5,0,0,115,4,0,0,0,0,10,14,6,122,20, + 107,15,5,0,0,115,4,0,0,0,0,10,14,6,122,20, 70,105,108,101,70,105,110,100,101,114,46,112,97,116,104,95, 104,111,111,107,99,1,0,0,0,0,0,0,0,1,0,0, 0,2,0,0,0,67,0,0,0,115,12,0,0,0,100,1, @@ -2227,7 +2227,7 @@ const unsigned char _Py_M__importlib_ext 105,108,101,70,105,110,100,101,114,40,123,33,114,125,41,41, 2,114,48,0,0,0,114,35,0,0,0,41,1,114,101,0, 0,0,114,4,0,0,0,114,4,0,0,0,114,5,0,0, - 0,114,241,0,0,0,32,5,0,0,115,2,0,0,0,0, + 0,114,241,0,0,0,33,5,0,0,115,2,0,0,0,0, 1,122,19,70,105,108,101,70,105,110,100,101,114,46,95,95, 114,101,112,114,95,95,41,1,78,41,15,114,106,0,0,0, 114,105,0,0,0,114,107,0,0,0,114,108,0,0,0,114, @@ -2235,7 +2235,7 @@ const unsigned char _Py_M__importlib_ext 0,0,0,114,118,0,0,0,114,2,1,0,0,114,176,0, 0,0,114,10,1,0,0,114,178,0,0,0,114,16,1,0, 0,114,241,0,0,0,114,4,0,0,0,114,4,0,0,0, - 114,4,0,0,0,114,5,0,0,0,114,3,1,0,0,145, + 114,4,0,0,0,114,5,0,0,0,114,3,1,0,0,146, 4,0,0,115,20,0,0,0,8,7,4,2,8,14,8,4, 4,2,8,12,8,5,10,48,8,31,12,18,114,3,1,0, 0,99,4,0,0,0,0,0,0,0,6,0,0,0,11,0, @@ -2259,7 +2259,7 @@ const unsigned char _Py_M__importlib_ext 99,112,97,116,104,110,97,109,101,114,121,0,0,0,114,159, 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,38,5,0,0,115,34,0,0,0,0,2,10,1,10, + 108,101,39,5,0,0,115,34,0,0,0,0,2,10,1,10, 1,4,1,4,1,8,1,8,1,12,2,10,1,4,1,16, 1,2,1,8,1,8,1,8,1,12,1,14,2,114,21,1, 0,0,99,0,0,0,0,0,0,0,0,3,0,0,0,3, @@ -2278,7 +2278,7 @@ const unsigned char _Py_M__importlib_ext 218,0,0,0,114,75,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,156,0,0,0,61,5,0, + 0,0,0,114,5,0,0,0,114,156,0,0,0,62,5,0, 0,115,8,0,0,0,0,5,12,1,8,1,8,1,114,156, 0,0,0,99,1,0,0,0,0,0,0,0,12,0,0,0, 12,0,0,0,67,0,0,0,115,188,1,0,0,124,0,97, @@ -2331,7 +2331,7 @@ const unsigned char _Py_M__importlib_ext 1,0,113,2,100,1,83,0,41,2,114,29,0,0,0,78, 41,1,114,31,0,0,0,41,2,114,22,0,0,0,114,78, 0,0,0,114,4,0,0,0,114,4,0,0,0,114,5,0, - 0,0,114,222,0,0,0,97,5,0,0,115,2,0,0,0, + 0,0,114,222,0,0,0,98,5,0,0,115,2,0,0,0, 4,0,122,25,95,115,101,116,117,112,46,60,108,111,99,97, 108,115,62,46,60,103,101,110,101,120,112,114,62,114,60,0, 0,0,122,30,105,109,112,111,114,116,108,105,98,32,114,101, @@ -2361,7 +2361,7 @@ const unsigned char _Py_M__importlib_ext 95,109,111,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,72,5,0, + 114,5,0,0,0,218,6,95,115,101,116,117,112,73,5,0, 0,115,82,0,0,0,0,8,4,1,6,1,6,3,10,1, 10,1,10,1,12,2,10,1,16,3,22,1,14,2,22,1, 8,1,10,1,10,1,4,2,2,1,10,1,6,1,14,1, @@ -2385,7 +2385,7 @@ const unsigned char _Py_M__importlib_ext 0,0,114,246,0,0,0,114,213,0,0,0,41,2,114,29, 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,140, + 114,5,0,0,0,218,8,95,105,110,115,116,97,108,108,141, 5,0,0,115,16,0,0,0,0,2,8,1,6,1,20,1, 10,1,12,1,12,4,6,1,114,32,1,0,0,41,3,122, 3,119,105,110,114,1,0,0,0,114,2,0,0,0,41,1, @@ -2417,7 +2417,7 @@ const unsigned char _Py_M__importlib_ext 114,5,0,0,0,218,8,60,109,111,100,117,108,101,62,8, 0,0,0,115,102,0,0,0,4,17,4,3,8,12,8,5, 8,5,8,6,8,12,8,10,8,9,8,5,8,7,10,22, - 10,116,16,1,12,2,4,1,4,2,6,2,6,2,8,2, + 10,117,16,1,12,2,4,1,4,2,6,2,6,2,8,2, 16,44,8,33,8,19,8,12,8,12,8,28,8,17,10,55, 10,12,10,10,8,14,6,3,4,1,14,65,14,64,14,29, 16,110,14,41,18,45,18,16,4,3,18,53,14,60,14,42, diff -r 2f0716009132 Python/opcode_targets.h --- a/Python/opcode_targets.h Tue Jul 12 18:24:25 2016 -0400 +++ b/Python/opcode_targets.h Wed Jul 13 23:06:36 2016 +0300 @@ -156,7 +156,7 @@ static void *opcode_targets[256] = { &&TARGET_SETUP_ASYNC_WITH, &&TARGET_FORMAT_VALUE, &&TARGET_BUILD_CONST_KEY_MAP, - &&_unknown_opcode, + &&TARGET_BUILD_STRING, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode,