[Python-checkins] bpo-42202: Store func annotations as a tuple (GH-23316)

methane webhook-mailer at python.org
Wed Nov 25 05:43:32 EST 2020

• Previous message (by thread): [Python-checkins] Add more tests to the descriptor howto guide (GH-23506) (GH-23510)
• Next message (by thread): [Python-checkins] bpo-42392: Improve removal of *loop* parameter in asyncio primitives (GH-23499)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

https://github.com/python/cpython/commit/7301979b23406220510dd2c7934a21b41b647119
commit: 7301979b23406220510dd2c7934a21b41b647119
branch: master
author: Yurii Karabas <1998uriyyo at gmail.com>
committer: methane <songofacandy at gmail.com>
date: 2020年11月25日T19:43:18+09:00
summary:
bpo-42202: Store func annotations as a tuple (GH-23316)
Reduce memory footprint and improve performance of loading modules having many func annotations.
 >>> sys.getsizeof({"a":"int","b":"int","return":"int"})
 232
 >>> sys.getsizeof(("a","int","b","int","return","int"))
 88
The tuple is converted into dict on the fly when `func.__annotations__` is accessed first.
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
Co-authored-by: Inada Naoki <songofacandy at gmail.com>
files:
A Misc/NEWS.d/next/Core and Builtins/2020-11-16-18-13-07.bpo-42202.ZxenYD.rst
M Doc/library/dis.rst
M Doc/whatsnew/3.10.rst
M Lib/importlib/_bootstrap_external.py
M Objects/funcobject.c
M Python/ceval.c
M Python/compile.c
M Python/importlib_external.h
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index d0307bd8e9f3d..8347c50ce3e0d 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -1144,11 +1144,13 @@ All of the following opcodes use their arguments.
 * ``0x01`` a tuple of default values for positional-only and
 positional-or-keyword parameters in positional order
 * ``0x02`` a dictionary of keyword-only parameters' default values
- * ``0x04`` an annotation dictionary
+ * ``0x04`` a tuple of strings containing parameters' annotations
 * ``0x08`` a tuple containing cells for free variables, making a closure
 * the code associated with the function (at TOS1)
 * the :term:`qualified name` of the function (at TOS)
 
+ .. versionchanged:: 3.10
+ Flag value ``0x04`` is a tuple of strings instead of dictionary
 
 .. opcode:: BUILD_SLICE (argc)
 
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index c5efaaa5047e2..704de8156f312 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -388,6 +388,11 @@ Optimizations
 for more details. (Contributed by Victor Stinner and Pablo Galindo in
 :issue:`38980`)
 
+* Function parameters and their annotations are no longer computed at runtime,
+ but rather at compilation time. They are stored as a tuple of strings at the
+ bytecode level. It is now around 100% faster to create a function with parameter
+ annotations. (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
+
 Deprecated
 ==========
 
@@ -461,6 +466,12 @@ Changes in the Python API
 have been renamed to *exc*.
 (Contributed by Zackery Spytz and Matthias Bussonnier in :issue:`26389`.)
 
+CPython bytecode changes
+========================
+
+* The ``MAKE_FUNCTION`` instruction accepts tuple of strings as annotations
+ instead of dictionary.
+ (Contributed by Yurii Karabas and Inada Naoki in :issue:`42202`)
 
 Build Changes
 =============
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 0ae49cf5ba390..b8dd128238f03 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -311,6 +311,7 @@ def _write_atomic(path, data, mode=0o666):
 # Python 3.9a2 3425 (simplify bytecodes for **value unpacking)
 # Python 3.10a1 3430 (Make 'annotations' future by default)
 # Python 3.10a1 3431 (New line number table format -- PEP 626)
+# Python 3.10a2 3432 (Function annotation for MAKE_FUNCTION is changed from dict to tuple bpo-42202)
 
 #
 # MAGIC must change whenever the bytecode emitted by the compiler may no
@@ -320,7 +321,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 = (3431).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3432).to_bytes(2, 'little') + b'\r\n'
 _RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
 
 _PYCACHE = '__pycache__'
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-11-16-18-13-07.bpo-42202.ZxenYD.rst b/Misc/NEWS.d/next/Core and Builtins/2020-11-16-18-13-07.bpo-42202.ZxenYD.rst
new file mode 100644
index 0000000000000..aba8ce6686fa2
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-11-16-18-13-07.bpo-42202.ZxenYD.rst	
@@ -0,0 +1,2 @@
+Change function parameters annotations internal representation to tuple
+of strings. Patch provided by Yurii Karabas.
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 9b4302a13c10f..e7961b3e6eb4b 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -424,6 +424,25 @@ func_get_annotations(PyFunctionObject *op, void *Py_UNUSED(ignored))
 if (op->func_annotations == NULL)
 return NULL;
 }
+ if (PyTuple_CheckExact(op->func_annotations)) {
+ PyObject *ann_tuple = op->func_annotations;
+ PyObject *ann_dict = PyDict_New();
+ if (ann_dict == NULL) {
+ return NULL;
+ }
+
+ assert(PyTuple_GET_SIZE(ann_tuple) % 2 == 0);
+
+ for (Py_ssize_t i = 0; i < PyTuple_GET_SIZE(ann_tuple); i += 2) {
+ int err = PyDict_SetItem(ann_dict,
+ PyTuple_GET_ITEM(ann_tuple, i),
+ PyTuple_GET_ITEM(ann_tuple, i + 1));
+
+ if (err < 0)
+ return NULL;
+ }
+ Py_SETREF(op->func_annotations, ann_dict);
+ }
 Py_INCREF(op->func_annotations);
 return op->func_annotations;
 }
diff --git a/Python/ceval.c b/Python/ceval.c
index 3d65e161302a9..693852e15b7c3 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3880,7 +3880,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
 func ->func_closure = POP();
 }
 if (oparg & 0x04) {
- assert(PyDict_CheckExact(TOP()));
+ assert(PyTuple_CheckExact(TOP()));
 func->func_annotations = POP();
 }
 if (oparg & 0x02) {
diff --git a/Python/compile.c b/Python/compile.c
index 1989b4af320da..57aa43476becd 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2027,26 +2027,24 @@ compiler_visit_annexpr(struct compiler *c, expr_ty annotation)
 
 static int
 compiler_visit_argannotation(struct compiler *c, identifier id,
- expr_ty annotation, PyObject *names)
+ expr_ty annotation, Py_ssize_t *annotations_len)
 {
 if (annotation) {
- PyObject *mangled;
- VISIT(c, annexpr, annotation);
- mangled = _Py_Mangle(c->u->u_private, id);
+ PyObject *mangled = _Py_Mangle(c->u->u_private, id);
 if (!mangled)
 return 0;
- if (PyList_Append(names, mangled) < 0) {
- Py_DECREF(mangled);
- return 0;
- }
+
+ ADDOP_LOAD_CONST(c, mangled);
 Py_DECREF(mangled);
+ VISIT(c, annexpr, annotation);
+ *annotations_len += 2;
 }
 return 1;
 }
 
 static int
 compiler_visit_argannotations(struct compiler *c, asdl_arg_seq* args,
- PyObject *names)
+ Py_ssize_t *annotations_len)
 {
 int i;
 for (i = 0; i < asdl_seq_LEN(args); i++) {
@@ -2055,7 +2053,7 @@ compiler_visit_argannotations(struct compiler *c, asdl_arg_seq* args,
 c,
 arg->arg,
 arg->annotation,
- names))
+ annotations_len))
 return 0;
 }
 return 1;
@@ -2065,58 +2063,44 @@ static int
 compiler_visit_annotations(struct compiler *c, arguments_ty args,
 expr_ty returns)
 {
- /* Push arg annotation dict.
+ /* Push arg annotation names and values.
 The expressions are evaluated out-of-order wrt the source code.
 
- Return 0 on error, -1 if no dict pushed, 1 if a dict is pushed.
+ Return 0 on error, -1 if no annotations pushed, 1 if a annotations is pushed.
 */
 static identifier return_str;
- PyObject *names;
- Py_ssize_t len;
- names = PyList_New(0);
- if (!names)
- return 0;
+ Py_ssize_t annotations_len = 0;
 
- if (!compiler_visit_argannotations(c, args->args, names))
- goto error;
- if (!compiler_visit_argannotations(c, args->posonlyargs, names))
- goto error;
+ if (!compiler_visit_argannotations(c, args->args, &annotations_len))
+ return 0;
+ if (!compiler_visit_argannotations(c, args->posonlyargs, &annotations_len))
+ return 0;
 if (args->vararg && args->vararg->annotation &&
 !compiler_visit_argannotation(c, args->vararg->arg,
- args->vararg->annotation, names))
- goto error;
- if (!compiler_visit_argannotations(c, args->kwonlyargs, names))
- goto error;
+ args->vararg->annotation, &annotations_len))
+ return 0;
+ if (!compiler_visit_argannotations(c, args->kwonlyargs, &annotations_len))
+ return 0;
 if (args->kwarg && args->kwarg->annotation &&
 !compiler_visit_argannotation(c, args->kwarg->arg,
- args->kwarg->annotation, names))
- goto error;
+ args->kwarg->annotation, &annotations_len))
+ return 0;
 
 if (!return_str) {
 return_str = PyUnicode_InternFromString("return");
 if (!return_str)
- goto error;
+ return 0;
 }
- if (!compiler_visit_argannotation(c, return_str, returns, names)) {
- goto error;
+ if (!compiler_visit_argannotation(c, return_str, returns, &annotations_len)) {
+ return 0;
 }
 
- len = PyList_GET_SIZE(names);
- if (len) {
- PyObject *keytuple = PyList_AsTuple(names);
- Py_DECREF(names);
- ADDOP_LOAD_CONST_NEW(c, keytuple);
- ADDOP_I(c, BUILD_CONST_KEY_MAP, len);
+ if (annotations_len) {
+ ADDOP_I(c, BUILD_TUPLE, annotations_len);
 return 1;
 }
- else {
- Py_DECREF(names);
- return -1;
- }
 
-error:
- Py_DECREF(names);
- return 0;
+ return -1;
 }
 
 static int
diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index bf272428b49b9..de4db360b0606 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -317,7 +317,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 99,152,0,0,0,115,38,0,0,0,16,5,6,1,22,1,
 4,255,2,2,14,3,40,1,14,1,4,128,12,1,2,1,
 12,1,2,3,12,254,2,1,2,1,2,255,2,1,255,128,
- 114,77,0,0,0,105,103,13,0,0,114,39,0,0,0,114,
+ 114,77,0,0,0,105,104,13,0,0,114,39,0,0,0,114,
 29,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,119,122,4,46,112,121,99,41,
@@ -431,7 +431,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 97,103,90,15,97,108,109,111,115,116,95,102,105,108,101,110,
 97,109,101,218,8,102,105,108,101,110,97,109,101,114,7,0,
 0,0,114,7,0,0,0,114,8,0,0,0,218,17,99,97,
- 99,104,101,95,102,114,111,109,95,115,111,117,114,99,101,83,
+ 99,104,101,95,102,114,111,109,95,115,111,117,114,99,101,84,
 1,0,0,115,74,0,0,0,8,18,6,1,2,1,4,255,
 8,2,4,1,8,1,12,1,10,1,12,1,16,1,8,1,
 8,1,8,1,24,1,8,1,12,1,6,1,8,2,8,1,
@@ -513,7 +513,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 13,98,97,115,101,95,102,105,108,101,110,97,109,101,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,218,17,115,
 111,117,114,99,101,95,102,114,111,109,95,99,97,99,104,101,
- 154,1,0,0,115,62,0,0,0,12,9,8,1,10,1,12,
+ 155,1,0,0,115,62,0,0,0,12,9,8,1,10,1,12,
 1,4,1,10,1,12,1,14,1,16,1,4,1,4,1,12,
 1,8,1,8,1,2,1,8,255,10,2,8,1,14,1,10,
 1,16,1,10,1,4,1,2,1,8,255,16,2,10,1,16,
@@ -548,7 +548,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 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,7,0,0,0,114,7,
 0,0,0,114,8,0,0,0,218,15,95,103,101,116,95,115,
- 111,117,114,99,101,102,105,108,101,194,1,0,0,115,22,0,
+ 111,117,114,99,101,102,105,108,101,195,1,0,0,115,22,0,
 0,0,12,7,4,1,16,1,24,1,4,1,2,1,12,1,
 16,1,18,1,16,1,255,128,114,113,0,0,0,99,1,0,
 0,0,0,0,0,0,0,0,0,0,1,0,0,0,8,0,
@@ -561,7 +561,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 116,117,112,108,101,114,106,0,0,0,114,102,0,0,0,114,
 88,0,0,0,114,94,0,0,0,41,1,114,101,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
- 11,95,103,101,116,95,99,97,99,104,101,100,213,1,0,0,
+ 11,95,103,101,116,95,99,97,99,104,101,100,214,1,0,0,
 115,22,0,0,0,14,1,2,1,10,1,12,1,2,1,4,
 128,2,0,14,1,4,1,4,2,255,128,114,117,0,0,0,
 99,1,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
@@ -576,7 +576,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,78,41,3,114,57,0,0,0,114,59,0,0,0,114,58,
 0,0,0,41,2,114,52,0,0,0,114,60,0,0,0,114,
 7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,10,
- 95,99,97,108,99,95,109,111,100,101,225,1,0,0,115,14,
+ 95,99,97,108,99,95,109,111,100,101,226,1,0,0,115,14,
 0,0,0,2,2,14,1,12,1,10,1,8,3,4,1,255,
 128,114,119,0,0,0,99,1,0,0,0,0,0,0,0,0,
 0,0,0,3,0,0,0,4,0,0,0,3,0,0,0,115,
@@ -614,7 +614,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,218,6,107,119,97,114,103,115,169,1,218,6,109,101,116,
 104,111,100,114,7,0,0,0,114,8,0,0,0,218,19,95,
 99,104,101,99,107,95,110,97,109,101,95,119,114,97,112,112,
- 101,114,245,1,0,0,115,20,0,0,0,8,1,8,1,10,
+ 101,114,246,1,0,0,115,20,0,0,0,8,1,8,1,10,
 1,4,1,8,1,2,255,2,1,6,255,24,2,255,128,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,
@@ -632,14 +632,14 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 95,95,100,105,99,116,95,95,218,6,117,112,100,97,116,101,
 41,3,90,3,110,101,119,90,3,111,108,100,114,75,0,0,
 0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
- 218,5,95,119,114,97,112,2,2,0,0,115,12,0,0,0,
+ 218,5,95,119,114,97,112,3,2,0,0,115,12,0,0,0,
 8,1,10,1,20,1,14,1,4,128,255,128,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,2,218,10,95,
 98,111,111,116,115,116,114,97,112,114,138,0,0,0,41,3,
 114,127,0,0,0,114,128,0,0,0,114,138,0,0,0,114,
 7,0,0,0,114,126,0,0,0,114,8,0,0,0,218,11,
- 95,99,104,101,99,107,95,110,97,109,101,237,1,0,0,115,
+ 95,99,104,101,99,107,95,110,97,109,101,238,1,0,0,115,
 14,0,0,0,14,8,8,10,8,1,8,2,10,6,4,1,
 255,128,114,140,0,0,0,99,2,0,0,0,0,0,0,0,
 0,0,0,0,5,0,0,0,6,0,0,0,67,0,0,0,
@@ -668,7 +668,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 8,112,111,114,116,105,111,110,115,218,3,109,115,103,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,218,17,95,
 102,105,110,100,95,109,111,100,117,108,101,95,115,104,105,109,
- 12,2,0,0,115,12,0,0,0,14,10,16,1,4,1,22,
+ 13,2,0,0,115,12,0,0,0,14,10,16,1,4,1,22,
 1,4,1,255,128,114,147,0,0,0,99,3,0,0,0,0,
 0,0,0,0,0,0,0,6,0,0,0,4,0,0,0,67,
 0,0,0,115,166,0,0,0,124,0,100,1,100,2,133,2,
@@ -735,7 +735,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 116,97,105,108,115,90,5,109,97,103,105,99,114,98,0,0,
 0,114,16,0,0,0,114,7,0,0,0,114,7,0,0,0,
 114,8,0,0,0,218,13,95,99,108,97,115,115,105,102,121,
- 95,112,121,99,29,2,0,0,115,30,0,0,0,12,16,8,
+ 95,112,121,99,30,2,0,0,115,30,0,0,0,12,16,8,
 1,16,1,12,1,16,1,12,1,10,1,12,1,8,1,16,
 1,8,2,16,1,16,1,4,1,255,128,114,156,0,0,0,
 99,5,0,0,0,0,0,0,0,0,0,0,0,6,0,0,
@@ -790,7 +790,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,114,155,0,0,0,114,98,0,0,0,114,7,0,
 0,0,114,7,0,0,0,114,8,0,0,0,218,23,95,118,
 97,108,105,100,97,116,101,95,116,105,109,101,115,116,97,109,
- 112,95,112,121,99,62,2,0,0,115,20,0,0,0,24,19,
+ 112,95,112,121,99,63,2,0,0,115,20,0,0,0,24,19,
 10,1,12,1,16,1,8,1,22,1,2,255,22,2,4,128,
 255,128,114,160,0,0,0,99,4,0,0,0,0,0,0,0,
 0,0,0,0,4,0,0,0,4,0,0,0,67,0,0,0,
@@ -836,7 +836,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,218,11,115,111,117,114,99,101,95,104,97,115,104,114,
 121,0,0,0,114,155,0,0,0,114,7,0,0,0,114,7,
 0,0,0,114,8,0,0,0,218,18,95,118,97,108,105,100,
- 97,116,101,95,104,97,115,104,95,112,121,99,90,2,0,0,
+ 97,116,101,95,104,97,115,104,95,112,121,99,91,2,0,0,
 115,16,0,0,0,16,17,2,1,8,1,4,255,2,2,6,
 254,4,128,255,128,114,162,0,0,0,99,4,0,0,0,0,
 0,0,0,0,0,0,0,5,0,0,0,5,0,0,0,67,
@@ -860,7 +860,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,37,0,0,0,114,121,0,0,0,114,111,0,0,0,114,
 112,0,0,0,218,4,99,111,100,101,114,7,0,0,0,114,
 7,0,0,0,114,8,0,0,0,218,17,95,99,111,109,112,
- 105,108,101,95,98,121,116,101,99,111,100,101,114,2,0,0,
+ 105,108,101,95,98,121,116,101,99,111,100,101,115,2,0,0,
 115,20,0,0,0,10,2,10,1,12,1,8,1,12,1,4,
 1,10,2,4,1,6,255,255,128,114,169,0,0,0,99,3,
 0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,5,
@@ -879,7 +879,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,159,0,0,0,114,37,0,0,0,114,7,0,0,0,114,
 7,0,0,0,114,8,0,0,0,218,22,95,99,111,100,101,
 95,116,111,95,116,105,109,101,115,116,97,109,112,95,112,121,
- 99,127,2,0,0,115,14,0,0,0,8,2,14,1,14,1,
+ 99,128,2,0,0,115,14,0,0,0,8,2,14,1,14,1,
 14,1,16,1,4,1,255,128,114,174,0,0,0,84,99,3,
 0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,5,
 0,0,0,67,0,0,0,115,80,0,0,0,116,0,116,1,
@@ -897,7 +897,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,90,7,99,104,101,99,107,101,100,114,37,0,0,0,
 114,16,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
 8,0,0,0,218,17,95,99,111,100,101,95,116,111,95,104,
- 97,115,104,95,112,121,99,137,2,0,0,115,16,0,0,0,
+ 97,115,104,95,112,121,99,138,2,0,0,115,16,0,0,0,
 8,2,12,1,14,1,16,1,10,1,16,1,4,1,255,128,
 114,175,0,0,0,99,1,0,0,0,0,0,0,0,0,0,
 0,0,5,0,0,0,6,0,0,0,67,0,0,0,115,62,
@@ -925,7 +925,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 105,110,103,90,15,110,101,119,108,105,110,101,95,100,101,99,
 111,100,101,114,114,7,0,0,0,114,7,0,0,0,114,8,
 0,0,0,218,13,100,101,99,111,100,101,95,115,111,117,114,
- 99,101,148,2,0,0,115,12,0,0,0,8,5,12,1,10,
+ 99,101,149,2,0,0,115,12,0,0,0,8,5,12,1,10,
 1,12,1,20,1,255,128,114,180,0,0,0,169,2,114,144,
 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,111,110,115,99,
@@ -986,7 +986,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,114,186,0,0,0,90,7,100,105,114,110,97,109,101,114,
 7,0,0,0,114,7,0,0,0,114,8,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,165,2,0,0,115,64,0,0,0,
+ 111,99,97,116,105,111,110,166,2,0,0,115,64,0,0,0,
 8,12,4,4,10,1,2,2,14,1,12,1,6,1,10,2,
 16,8,6,1,8,3,14,1,14,1,10,1,6,1,4,1,
 4,2,8,3,10,2,2,1,14,1,12,1,6,1,4,2,
@@ -1024,7 +1024,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 69,89,95,76,79,67,65,76,95,77,65,67,72,73,78,69,
 114,19,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
 8,0,0,0,218,14,95,111,112,101,110,95,114,101,103,105,
- 115,116,114,121,245,2,0,0,115,10,0,0,0,2,2,16,
+ 115,116,114,121,246,2,0,0,115,10,0,0,0,2,2,16,
 1,12,1,20,1,255,128,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,
@@ -1051,7 +1051,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 107,101,121,114,20,0,0,0,90,4,104,107,101,121,218,8,
 102,105,108,101,112,97,116,104,114,7,0,0,0,114,7,0,
 0,0,114,8,0,0,0,218,16,95,115,101,97,114,99,104,
- 95,114,101,103,105,115,116,114,121,252,2,0,0,115,26,0,
+ 95,114,101,103,105,115,116,114,121,253,2,0,0,115,26,0,
 0,0,6,2,8,1,6,2,6,1,16,1,6,255,2,2,
 12,1,44,1,4,3,12,254,8,1,255,128,122,38,87,105,
 110,100,111,119,115,82,101,103,105,115,116,114,121,70,105,110,
@@ -1073,7 +1073,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 143,0,0,0,114,52,0,0,0,218,6,116,97,114,103,101,
 116,114,203,0,0,0,114,144,0,0,0,114,193,0,0,0,
 114,191,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 8,0,0,0,218,9,102,105,110,100,95,115,112,101,99,11,
+ 8,0,0,0,218,9,102,105,110,100,95,115,112,101,99,12,
 3,0,0,115,32,0,0,0,10,2,8,1,4,1,2,1,
 12,1,12,1,8,1,14,1,14,1,6,1,8,1,2,1,
 6,254,8,3,4,128,255,128,122,31,87,105,110,100,111,119,
@@ -1093,7 +1093,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,169,4,114,202,0,0,0,114,143,0,0,0,114,52,
 0,0,0,114,191,0,0,0,114,7,0,0,0,114,7,0,
 0,0,114,8,0,0,0,218,11,102,105,110,100,95,109,111,
- 100,117,108,101,27,3,0,0,115,10,0,0,0,12,7,8,
+ 100,117,108,101,28,3,0,0,115,10,0,0,0,12,7,8,
 1,6,1,4,2,255,128,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,
@@ -1105,7 +1105,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 101,116,104,111,100,114,197,0,0,0,218,11,99,108,97,115,
 115,109,101,116,104,111,100,114,204,0,0,0,114,207,0,0,
 0,114,210,0,0,0,114,7,0,0,0,114,7,0,0,0,
- 114,7,0,0,0,114,8,0,0,0,114,195,0,0,0,233,
+ 114,7,0,0,0,114,8,0,0,0,114,195,0,0,0,234,
 2,0,0,115,32,0,0,0,8,0,4,2,2,3,2,255,
 2,4,2,255,12,3,2,2,10,1,2,6,10,1,2,14,
 12,1,2,15,16,1,255,128,114,195,0,0,0,99,0,0,
@@ -1142,7 +1142,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,114,101,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,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 186,0,0,0,46,3,0,0,115,10,0,0,0,18,3,16,
+ 186,0,0,0,47,3,0,0,115,10,0,0,0,18,3,16,
 1,14,1,16,1,255,128,122,24,95,76,111,97,100,101,114,
 66,97,115,105,99,115,46,105,115,95,112,97,99,107,97,103,
 101,99,2,0,0,0,0,0,0,0,0,0,0,0,2,0,
@@ -1153,7 +1153,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 46,78,114,7,0,0,0,169,2,114,123,0,0,0,114,191,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
 0,0,218,13,99,114,101,97,116,101,95,109,111,100,117,108,
- 101,54,3,0,0,115,4,0,0,0,4,128,255,128,122,27,
+ 101,55,3,0,0,115,4,0,0,0,4,128,255,128,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,0,0,0,0,3,0,0,0,5,0,0,0,
@@ -1173,7 +1173,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,136,0,0,0,41,3,114,123,0,0,0,218,6,109,111,
 100,117,108,101,114,168,0,0,0,114,7,0,0,0,114,7,
 0,0,0,114,8,0,0,0,218,11,101,120,101,99,95,109,
- 111,100,117,108,101,57,3,0,0,115,16,0,0,0,12,2,
+ 111,100,117,108,101,58,3,0,0,115,16,0,0,0,12,2,
 8,1,6,1,4,1,6,255,16,2,4,128,255,128,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,
@@ -1185,14 +1185,14 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 95,109,111,100,117,108,101,95,115,104,105,109,169,2,114,123,
 0,0,0,114,143,0,0,0,114,7,0,0,0,114,7,0,
 0,0,114,8,0,0,0,218,11,108,111,97,100,95,109,111,
- 100,117,108,101,65,3,0,0,115,4,0,0,0,12,2,255,
+ 100,117,108,101,66,3,0,0,115,4,0,0,0,12,2,255,
 128,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,
 130,0,0,0,114,129,0,0,0,114,131,0,0,0,114,132,
 0,0,0,114,186,0,0,0,114,219,0,0,0,114,224,0,
 0,0,114,227,0,0,0,114,7,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,215,0,0,0,
- 41,3,0,0,115,14,0,0,0,8,0,4,2,8,3,8,
+ 42,3,0,0,115,14,0,0,0,8,0,4,2,8,3,8,
 8,8,3,12,8,255,128,114,215,0,0,0,99,0,0,0,
 0,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,
@@ -1216,7 +1216,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 110,100,108,101,100,46,10,32,32,32,32,32,32,32,32,78,
 41,1,114,58,0,0,0,169,2,114,123,0,0,0,114,52,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,218,10,112,97,116,104,95,109,116,105,109,101,72,3,
+ 0,0,218,10,112,97,116,104,95,109,116,105,109,101,73,3,
 0,0,115,4,0,0,0,4,6,255,128,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,0,0,0,
@@ -1251,7 +1251,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 32,32,32,32,32,114,173,0,0,0,78,41,1,114,230,0,
 0,0,114,229,0,0,0,114,7,0,0,0,114,7,0,0,
 0,114,8,0,0,0,218,10,112,97,116,104,95,115,116,97,
- 116,115,80,3,0,0,115,4,0,0,0,14,12,255,128,122,
+ 116,115,81,3,0,0,115,4,0,0,0,14,12,255,128,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,0,0,0,0,4,0,0,0,4,0,0,0,67,0,0,
@@ -1275,7 +1275,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,90,10,99,97,99,104,101,95,112,97,116,104,114,
 37,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
 0,0,0,218,15,95,99,97,99,104,101,95,98,121,116,101,
- 99,111,100,101,94,3,0,0,115,4,0,0,0,12,8,255,
+ 99,111,100,101,95,3,0,0,115,4,0,0,0,12,8,255,
 128,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,0,0,0,0,3,0,0,0,
@@ -1292,7 +1292,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,46,10,32,32,32,32,32,32,32,32,78,114,7,0,0,
 0,41,3,114,123,0,0,0,114,52,0,0,0,114,37,0,
 0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
- 0,114,232,0,0,0,104,3,0,0,115,4,0,0,0,4,
+ 0,114,232,0,0,0,105,3,0,0,115,4,0,0,0,4,
 128,255,128,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,0,0,0,0,5,0,0,0,10,0,0,0,67,
@@ -1312,7 +1312,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,180,0,0,0,41,5,114,123,0,0,0,114,143,0,0,
 0,114,52,0,0,0,114,178,0,0,0,218,3,101,120,99,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
- 10,103,101,116,95,115,111,117,114,99,101,111,3,0,0,115,
+ 10,103,101,116,95,115,111,117,114,99,101,112,3,0,0,115,
 24,0,0,0,10,2,2,1,12,1,8,4,14,253,4,1,
 2,1,4,255,2,1,2,255,10,128,255,128,122,23,83,111,
 117,114,99,101,76,111,97,100,101,114,46,103,101,116,95,115,
@@ -1335,7 +1335,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 108,101,41,4,114,123,0,0,0,114,37,0,0,0,114,52,
 0,0,0,114,237,0,0,0,114,7,0,0,0,114,7,0,
 0,0,114,8,0,0,0,218,14,115,111,117,114,99,101,95,
- 116,111,95,99,111,100,101,121,3,0,0,115,8,0,0,0,
+ 116,111,95,99,111,100,101,122,3,0,0,115,8,0,0,0,
 12,5,4,1,6,255,255,128,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,0,0,
@@ -1412,7 +1412,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 37,0,0,0,114,155,0,0,0,114,16,0,0,0,90,10,
 98,121,116,101,115,95,100,97,116,97,90,11,99,111,100,101,
 95,111,98,106,101,99,116,114,7,0,0,0,114,7,0,0,
- 0,114,8,0,0,0,114,220,0,0,0,129,3,0,0,115,
+ 0,114,8,0,0,0,114,220,0,0,0,130,3,0,0,115,
 160,0,0,0,10,7,4,1,4,1,4,1,4,1,4,1,
 2,1,12,1,12,1,12,1,2,2,14,1,12,1,8,1,
 12,2,2,1,14,1,12,1,6,1,2,3,2,1,6,254,
@@ -1429,7 +1429,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,231,0,0,0,114,233,0,0,0,114,232,0,0,
 0,114,236,0,0,0,114,240,0,0,0,114,220,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 8,0,0,0,114,228,0,0,0,70,3,0,0,115,18,0,
+ 8,0,0,0,114,228,0,0,0,71,3,0,0,115,18,0,
 0,0,8,0,8,2,8,8,8,14,8,10,8,7,14,10,
 12,8,255,128,114,228,0,0,0,99,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,
@@ -1457,7 +1457,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 102,105,110,100,101,114,46,78,114,163,0,0,0,41,3,114,
 123,0,0,0,114,143,0,0,0,114,52,0,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,114,216,0,
- 0,0,219,3,0,0,115,8,0,0,0,6,3,6,1,4,
+ 0,0,220,3,0,0,115,8,0,0,0,6,3,6,1,4,
 128,255,128,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,0,0,0,0,2,0,0,0,2,0,0,0,67,0,0,
@@ -1466,7 +1466,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,169,2,218,9,95,95,99,108,97,115,115,95,95,
 114,136,0,0,0,169,2,114,123,0,0,0,90,5,111,116,
 104,101,114,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,218,6,95,95,101,113,95,95,225,3,0,0,115,8,
+ 0,0,218,6,95,95,101,113,95,95,226,3,0,0,115,8,
 0,0,0,12,1,10,1,2,255,255,128,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,0,0,0,0,1,0,0,0,3,
@@ -1475,7 +1475,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,114,0,0,0,169,3,218,4,104,97,115,104,114,121,0,
 0,0,114,52,0,0,0,169,1,114,123,0,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,218,8,95,
- 95,104,97,115,104,95,95,229,3,0,0,115,4,0,0,0,
+ 95,104,97,115,104,95,95,230,3,0,0,115,4,0,0,0,
 20,1,255,128,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,0,0,0,0,2,0,0,0,3,0,0,0,3,0,
@@ -1489,7 +1489,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 116,101,97,100,46,10,10,32,32,32,32,32,32,32,32,78,
 41,3,218,5,115,117,112,101,114,114,246,0,0,0,114,227,
 0,0,0,114,226,0,0,0,169,1,114,248,0,0,0,114,
- 7,0,0,0,114,8,0,0,0,114,227,0,0,0,232,3,
+ 7,0,0,0,114,8,0,0,0,114,227,0,0,0,233,3,
 0,0,115,4,0,0,0,16,10,255,128,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,0,0,0,0,
@@ -1500,7 +1500,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 32,102,111,117,110,100,32,98,121,32,116,104,101,32,102,105,
 110,100,101,114,46,78,114,56,0,0,0,114,226,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 183,0,0,0,244,3,0,0,115,4,0,0,0,6,3,255,
+ 183,0,0,0,245,3,0,0,115,4,0,0,0,6,3,255,
 128,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,0,0,0,0,3,0,0,0,8,0,0,0,67,
@@ -1521,7 +1521,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 112,101,110,95,99,111,100,101,114,90,0,0,0,90,4,114,
 101,97,100,114,73,0,0,0,41,3,114,123,0,0,0,114,
 52,0,0,0,114,76,0,0,0,114,7,0,0,0,114,7,
- 0,0,0,114,8,0,0,0,114,234,0,0,0,249,3,0,
+ 0,0,0,114,8,0,0,0,114,234,0,0,0,250,3,0,
 0,115,16,0,0,0,14,2,16,1,38,1,4,128,14,2,
 38,1,4,128,255,128,122,19,70,105,108,101,76,111,97,100,
 101,114,46,103,101,116,95,100,97,116,97,99,2,0,0,0,
@@ -1534,7 +1534,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 123,0,0,0,114,223,0,0,0,114,4,1,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,218,19,103,
 101,116,95,114,101,115,111,117,114,99,101,95,114,101,97,100,
- 101,114,2,4,0,0,115,6,0,0,0,12,2,8,1,255,
+ 101,114,3,4,0,0,115,6,0,0,0,12,2,8,1,255,
 128,122,30,70,105,108,101,76,111,97,100,101,114,46,103,101,
 116,95,114,101,115,111,117,114,99,101,95,114,101,97,100,101,
 114,41,13,114,130,0,0,0,114,129,0,0,0,114,131,0,
@@ -1543,7 +1543,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,183,0,0,0,114,234,0,0,0,114,5,1,0,0,90,
 13,95,95,99,108,97,115,115,99,101,108,108,95,95,114,7,
 0,0,0,114,7,0,0,0,114,0,1,0,0,114,8,0,
- 0,0,114,246,0,0,0,214,3,0,0,115,26,0,0,0,
+ 0,0,114,246,0,0,0,215,3,0,0,115,26,0,0,0,
 8,0,4,2,8,3,8,6,8,4,2,3,14,1,2,11,
 10,1,8,4,2,9,18,1,255,128,114,246,0,0,0,99,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -1566,7 +1566,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 95,109,116,105,109,101,90,7,115,116,95,115,105,122,101,41,
 3,114,123,0,0,0,114,52,0,0,0,114,245,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 231,0,0,0,12,4,0,0,115,6,0,0,0,8,2,14,
+ 231,0,0,0,13,4,0,0,115,6,0,0,0,8,2,14,
 1,255,128,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,0,0,0,0,5,0,0,
@@ -1576,7 +1576,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 100,101,41,2,114,119,0,0,0,114,232,0,0,0,41,5,
 114,123,0,0,0,114,112,0,0,0,114,111,0,0,0,114,
 37,0,0,0,114,60,0,0,0,114,7,0,0,0,114,7,
- 0,0,0,114,8,0,0,0,114,233,0,0,0,17,4,0,
+ 0,0,0,114,8,0,0,0,114,233,0,0,0,18,4,0,
 0,115,6,0,0,0,8,2,16,1,255,128,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,68,
@@ -1611,7 +1611,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,9,1,0,0,218,6,112,97,114,101,110,116,114,
 101,0,0,0,114,47,0,0,0,114,43,0,0,0,114,235,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,114,232,0,0,0,22,4,0,0,115,54,0,0,0,
+ 0,0,114,232,0,0,0,23,4,0,0,115,54,0,0,0,
 12,2,4,1,12,2,12,1,12,1,12,2,10,1,2,1,
 14,1,12,1,4,2,14,1,6,3,4,1,4,255,16,2,
 10,128,2,1,12,1,14,1,4,128,14,1,8,2,2,1,
@@ -1621,7 +1621,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,114,132,0,0,0,114,231,0,0,0,114,233,0,
 0,0,114,232,0,0,0,114,7,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,6,1,0,0,
- 8,4,0,0,115,12,0,0,0,8,0,4,2,8,2,8,
+ 9,4,0,0,115,12,0,0,0,8,0,4,2,8,2,8,
 5,18,5,255,128,114,6,1,0,0,99,0,0,0,0,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,2,
@@ -1643,7 +1643,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,242,0,0,0,41,5,114,123,0,0,0,114,143,0,0,
 0,114,52,0,0,0,114,37,0,0,0,114,155,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 220,0,0,0,57,4,0,0,115,24,0,0,0,10,1,10,
+ 220,0,0,0,58,4,0,0,115,24,0,0,0,10,1,10,
 1,2,4,2,1,6,254,12,4,2,1,14,1,2,1,2,
 1,6,253,255,128,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,
@@ -1654,13 +1654,13 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,32,110,111,32,115,111,117,114,99,101,32,99,111,100,101,
 46,78,114,7,0,0,0,114,226,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,236,0,0,0,
- 73,4,0,0,115,4,0,0,0,4,2,255,128,122,31,83,
+ 74,4,0,0,115,4,0,0,0,4,2,255,128,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,130,0,0,0,114,129,0,0,0,114,131,0,0,0,
 114,132,0,0,0,114,220,0,0,0,114,236,0,0,0,114,
 7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
- 0,0,0,114,12,1,0,0,53,4,0,0,115,10,0,0,
+ 0,0,0,114,12,1,0,0,54,4,0,0,115,10,0,0,
 0,8,0,4,2,8,2,12,16,255,128,114,12,1,0,0,
 99,0,0,0,0,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,
@@ -1681,7 +1681,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 124,0,95,0,124,2,124,0,95,1,100,0,83,0,114,114,
 0,0,0,114,163,0,0,0,41,3,114,123,0,0,0,114,
 121,0,0,0,114,52,0,0,0,114,7,0,0,0,114,7,
- 0,0,0,114,8,0,0,0,114,216,0,0,0,86,4,0,
+ 0,0,0,114,8,0,0,0,114,216,0,0,0,87,4,0,
 0,115,8,0,0,0,6,1,6,1,4,128,255,128,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,
@@ -1690,7 +1690,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 106,0,107,2,111,22,124,0,106,1,124,1,106,1,107,2,
 83,0,114,114,0,0,0,114,247,0,0,0,114,249,0,0,
 0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
- 114,250,0,0,0,90,4,0,0,115,8,0,0,0,12,1,
+ 114,250,0,0,0,91,4,0,0,115,8,0,0,0,12,1,
 10,1,2,255,255,128,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,0,0,0,0,1,
@@ -1698,7 +1698,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 116,0,124,0,106,1,131,1,116,0,124,0,106,2,131,1,
 65,0,83,0,114,114,0,0,0,114,251,0,0,0,114,253,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,114,254,0,0,0,94,4,0,0,115,4,0,0,0,
+ 0,0,114,254,0,0,0,95,4,0,0,115,4,0,0,0,
 20,1,255,128,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,0,0,0,0,3,
@@ -1715,7 +1715,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 95,100,121,110,97,109,105,99,114,153,0,0,0,114,121,0,
 0,0,114,52,0,0,0,41,3,114,123,0,0,0,114,191,
 0,0,0,114,223,0,0,0,114,7,0,0,0,114,7,0,
- 0,0,114,8,0,0,0,114,219,0,0,0,97,4,0,0,
+ 0,0,114,8,0,0,0,114,219,0,0,0,98,4,0,0,
 115,16,0,0,0,4,2,6,1,4,255,6,2,8,1,4,
 255,4,2,255,128,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,
@@ -1733,7 +1733,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 121,110,97,109,105,99,114,153,0,0,0,114,121,0,0,0,
 114,52,0,0,0,169,2,114,123,0,0,0,114,223,0,0,
 0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
- 114,224,0,0,0,105,4,0,0,115,12,0,0,0,14,2,
+ 114,224,0,0,0,106,4,0,0,115,12,0,0,0,14,2,
 6,1,8,1,4,255,4,128,255,128,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,
@@ -1751,14 +1751,14 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 2,114,216,0,0,0,78,114,7,0,0,0,169,2,114,5,
 0,0,0,218,6,115,117,102,102,105,120,169,1,90,9,102,
 105,108,101,95,110,97,109,101,114,7,0,0,0,114,8,0,
- 0,0,114,9,0,0,0,114,4,0,0,115,10,0,0,0,
+ 0,0,114,9,0,0,0,115,4,0,0,115,10,0,0,0,
 4,0,2,1,16,255,4,128,255,128,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,112,114,62,78,41,4,
 114,55,0,0,0,114,52,0,0,0,218,3,97,110,121,114,
 212,0,0,0,114,226,0,0,0,114,7,0,0,0,114,16,
- 1,0,0,114,8,0,0,0,114,186,0,0,0,111,4,0,
+ 1,0,0,114,8,0,0,0,114,186,0,0,0,112,4,0,
 0,115,10,0,0,0,14,2,12,1,2,1,8,255,255,128,
 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,
@@ -1770,7 +1770,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 99,114,101,97,116,101,32,97,32,99,111,100,101,32,111,98,
 106,101,99,116,46,78,114,7,0,0,0,114,226,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 220,0,0,0,117,4,0,0,115,4,0,0,0,4,2,255,
+ 220,0,0,0,118,4,0,0,115,4,0,0,0,4,2,255,
 128,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,0,0,0,0,2,0,0,0,
@@ -1780,14 +1780,14 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 100,117,108,101,115,32,104,97,118,101,32,110,111,32,115,111,
 117,114,99,101,32,99,111,100,101,46,78,114,7,0,0,0,
 114,226,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 8,0,0,0,114,236,0,0,0,121,4,0,0,115,4,0,
+ 8,0,0,0,114,236,0,0,0,122,4,0,0,115,4,0,
 0,0,4,2,255,128,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,0,
 0,0,0,2,0,0,0,1,0,0,0,67,0,0,0,115,
 6,0,0,0,124,0,106,0,83,0,114,1,1,0,0,114,
 56,0,0,0,114,226,0,0,0,114,7,0,0,0,114,7,
- 0,0,0,114,8,0,0,0,114,183,0,0,0,125,4,0,
+ 0,0,0,114,8,0,0,0,114,183,0,0,0,126,4,0,
 0,115,4,0,0,0,6,3,255,128,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,
@@ -1796,7 +1796,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,219,0,0,0,114,224,0,0,0,114,186,0,0,
 0,114,220,0,0,0,114,236,0,0,0,114,140,0,0,0,
 114,183,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 7,0,0,0,114,8,0,0,0,114,3,1,0,0,78,4,
+ 7,0,0,0,114,8,0,0,0,114,3,1,0,0,79,4,
 0,0,115,26,0,0,0,8,0,4,2,8,6,8,4,8,
 4,8,3,8,8,8,6,8,6,8,4,2,4,14,1,255,
 128,114,3,1,0,0,99,0,0,0,0,0,0,0,0,0,
@@ -1839,7 +1839,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 104,95,102,105,110,100,101,114,169,4,114,123,0,0,0,114,
 121,0,0,0,114,52,0,0,0,90,11,112,97,116,104,95,
 102,105,110,100,101,114,114,7,0,0,0,114,7,0,0,0,
- 114,8,0,0,0,114,216,0,0,0,138,4,0,0,115,12,
+ 114,8,0,0,0,114,216,0,0,0,139,4,0,0,115,12,
 0,0,0,6,1,6,1,14,1,6,1,4,128,255,128,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,
@@ -1857,7 +1857,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,11,1,0,0,218,3,100,111,116,90,2,109,101,
 114,7,0,0,0,114,7,0,0,0,114,8,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,144,4,0,0,115,10,0,0,
+ 116,104,95,110,97,109,101,115,145,4,0,0,115,10,0,0,
 0,18,2,8,1,4,2,8,3,255,128,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,
@@ -1870,7 +1870,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,90,18,112,97,114,101,110,116,95,109,111,100,117,
 108,101,95,110,97,109,101,90,14,112,97,116,104,95,97,116,
 116,114,95,110,97,109,101,114,7,0,0,0,114,7,0,0,
- 0,114,8,0,0,0,114,21,1,0,0,154,4,0,0,115,
+ 0,114,8,0,0,0,114,21,1,0,0,155,4,0,0,115,
 6,0,0,0,12,1,16,1,255,128,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,
@@ -1886,7 +1886,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,114,20,1,0,0,41,3,114,123,0,0,0,90,
 11,112,97,114,101,110,116,95,112,97,116,104,114,191,0,0,
 0,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
- 218,12,95,114,101,99,97,108,99,117,108,97,116,101,158,4,
+ 218,12,95,114,101,99,97,108,99,117,108,97,116,101,159,4,
 0,0,115,18,0,0,0,12,2,10,1,14,1,18,3,6,
 1,8,1,6,1,6,1,255,128,122,27,95,78,97,109,101,
 115,112,97,99,101,80,97,116,104,46,95,114,101,99,97,108,
@@ -1896,7 +1896,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,114,0,0,0,41,2,218,4,105,116,101,114,114,28,1,
 0,0,114,253,0,0,0,114,7,0,0,0,114,7,0,0,
 0,114,8,0,0,0,218,8,95,95,105,116,101,114,95,95,
- 171,4,0,0,115,4,0,0,0,12,1,255,128,122,23,95,
+ 172,4,0,0,115,4,0,0,0,12,1,255,128,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,2,0,0,0,0,0,0,0,0,
 0,0,0,2,0,0,0,2,0,0,0,67,0,0,0,115,
@@ -1904,7 +1904,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,114,0,0,0,169,1,114,28,1,0,0,41,2,114,123,
 0,0,0,218,5,105,110,100,101,120,114,7,0,0,0,114,
 7,0,0,0,114,8,0,0,0,218,11,95,95,103,101,116,
- 105,116,101,109,95,95,174,4,0,0,115,4,0,0,0,12,
+ 105,116,101,109,95,95,175,4,0,0,115,4,0,0,0,12,
 1,255,128,122,26,95,78,97,109,101,115,112,97,99,101,80,
 97,116,104,46,95,95,103,101,116,105,116,101,109,95,95,99,
 3,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
@@ -1913,7 +1913,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 41,1,114,20,1,0,0,41,3,114,123,0,0,0,114,32,
 1,0,0,114,52,0,0,0,114,7,0,0,0,114,7,0,
 0,0,114,8,0,0,0,218,11,95,95,115,101,116,105,116,
- 101,109,95,95,177,4,0,0,115,6,0,0,0,10,1,4,
+ 101,109,95,95,178,4,0,0,115,6,0,0,0,10,1,4,
 128,255,128,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,0,0,0,0,1,0,0,0,
@@ -1921,7 +1921,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,160,1,161,0,131,1,83,0,114,114,0,0,0,41,2,
 114,4,0,0,0,114,28,1,0,0,114,253,0,0,0,114,
 7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,7,
- 95,95,108,101,110,95,95,180,4,0,0,115,4,0,0,0,
+ 95,95,108,101,110,95,95,181,4,0,0,115,4,0,0,0,
 12,1,255,128,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,0,0,0,0,1,0,0,0,3,0,0,
@@ -1930,7 +1930,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,112,97,99,101,80,97,116,104,40,123,33,114,125,41,41,
 2,114,70,0,0,0,114,20,1,0,0,114,253,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
- 8,95,95,114,101,112,114,95,95,183,4,0,0,115,4,0,
+ 8,95,95,114,101,112,114,95,95,184,4,0,0,115,4,0,
 0,0,12,1,255,128,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,0,0,0,0,2,0,0,0,
@@ -1938,7 +1938,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,160,0,161,0,118,0,83,0,114,114,0,0,0,114,31,
 1,0,0,169,2,114,123,0,0,0,218,4,105,116,101,109,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,218,
- 12,95,95,99,111,110,116,97,105,110,115,95,95,186,4,0,
+ 12,95,95,99,111,110,116,97,105,110,115,95,95,187,4,0,
 0,115,4,0,0,0,12,1,255,128,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,
@@ -1946,7 +1946,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,16,0,0,0,124,0,106,0,160,1,124,1,161,1,1,
 0,100,0,83,0,114,114,0,0,0,41,2,114,20,1,0,
 0,114,190,0,0,0,114,37,1,0,0,114,7,0,0,0,
- 114,7,0,0,0,114,8,0,0,0,114,190,0,0,0,189,
+ 114,7,0,0,0,114,8,0,0,0,114,190,0,0,0,190,
 4,0,0,115,6,0,0,0,12,1,4,128,255,128,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,15,114,130,0,0,0,114,129,0,
@@ -1955,7 +1955,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,30,1,0,0,114,33,1,0,0,114,34,1,0,0,114,
 35,1,0,0,114,36,1,0,0,114,39,1,0,0,114,190,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,
- 0,0,114,8,0,0,0,114,18,1,0,0,131,4,0,0,
+ 0,0,114,8,0,0,0,114,18,1,0,0,132,4,0,0,
 115,28,0,0,0,8,0,4,1,8,6,8,6,8,10,8,
 4,8,13,8,3,8,3,8,3,8,3,8,3,12,3,255,
 128,114,18,1,0,0,99,0,0,0,0,0,0,0,0,0,
@@ -1972,7 +1972,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 124,0,95,1,100,0,83,0,114,114,0,0,0,41,2,114,
 18,1,0,0,114,20,1,0,0,114,24,1,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,114,216,0,
- 0,0,195,4,0,0,115,6,0,0,0,14,1,4,128,255,
+ 0,0,196,4,0,0,115,6,0,0,0,14,1,4,128,255,
 128,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,1,0,0,
 0,0,0,0,0,0,0,0,0,1,0,0,0,3,0,0,
@@ -1989,21 +1989,21 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 101,115,112,97,99,101,41,62,78,41,2,114,70,0,0,0,
 114,130,0,0,0,41,1,114,223,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,218,11,109,111,100,
- 117,108,101,95,114,101,112,114,198,4,0,0,115,4,0,0,
+ 117,108,101,95,114,101,112,114,199,4,0,0,115,4,0,0,
 0,12,7,255,128,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,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,7,0,0,0,114,226,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,114,186,0,0,0,207,4,0,0,115,4,0,0,0,
+ 0,0,114,186,0,0,0,208,4,0,0,115,4,0,0,0,
 4,1,255,128,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,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,10,0,0,0,114,7,0,0,0,
 114,226,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 8,0,0,0,114,236,0,0,0,210,4,0,0,115,4,0,
+ 8,0,0,0,114,236,0,0,0,211,4,0,0,115,4,0,
 0,0,4,1,255,128,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,0,0,0,0,
@@ -2013,20 +2013,20 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 110,103,62,114,222,0,0,0,84,41,1,114,238,0,0,0,
 41,1,114,239,0,0,0,114,226,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,220,0,0,0,
- 213,4,0,0,115,4,0,0,0,16,1,255,128,122,25,95,
+ 214,4,0,0,115,4,0,0,0,16,1,255,128,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,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,114,217,0,0,0,114,
 7,0,0,0,114,218,0,0,0,114,7,0,0,0,114,7,
- 0,0,0,114,8,0,0,0,114,219,0,0,0,216,4,0,
+ 0,0,0,114,8,0,0,0,114,219,0,0,0,217,4,0,
 0,115,4,0,0,0,4,128,255,128,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,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,114,114,0,0,
 0,114,7,0,0,0,114,13,1,0,0,114,7,0,0,0,
- 114,7,0,0,0,114,8,0,0,0,114,224,0,0,0,219,
+ 114,7,0,0,0,114,8,0,0,0,114,224,0,0,0,220,
 4,0,0,115,6,0,0,0,2,1,2,128,255,128,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,
@@ -2045,7 +2045,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,125,78,41,4,114,139,0,0,0,114,153,0,0,0,114,
 20,1,0,0,114,225,0,0,0,114,226,0,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,114,227,0,
- 0,0,222,4,0,0,115,10,0,0,0,6,7,4,1,4,
+ 0,0,223,4,0,0,115,10,0,0,0,6,7,4,1,4,
 255,12,2,255,128,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,130,0,0,0,114,129,0,0,0,
@@ -2053,7 +2053,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 41,1,0,0,114,186,0,0,0,114,236,0,0,0,114,220,
 0,0,0,114,219,0,0,0,114,224,0,0,0,114,227,0,
 0,0,114,7,0,0,0,114,7,0,0,0,114,7,0,0,
- 0,114,8,0,0,0,114,40,1,0,0,194,4,0,0,115,
+ 0,114,8,0,0,0,114,40,1,0,0,195,4,0,0,115,
 22,0,0,0,8,0,8,1,2,3,10,1,8,8,8,3,
 8,3,8,3,8,3,12,3,255,128,114,40,1,0,0,99,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -2090,7 +2090,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 95,99,97,99,104,101,218,5,105,116,101,109,115,114,133,0,
 0,0,114,43,1,0,0,41,2,114,121,0,0,0,218,6,
 102,105,110,100,101,114,114,7,0,0,0,114,7,0,0,0,
- 114,8,0,0,0,114,43,1,0,0,240,4,0,0,115,14,
+ 114,8,0,0,0,114,43,1,0,0,241,4,0,0,115,14,
 0,0,0,22,4,8,1,10,1,10,1,10,1,4,128,255,
 128,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,
@@ -2110,7 +2110,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,142,0,0,0,114,122,0,0,0,41,2,114,52,
 0,0,0,90,4,104,111,111,107,114,7,0,0,0,114,7,
 0,0,0,114,8,0,0,0,218,11,95,112,97,116,104,95,
- 104,111,111,107,115,250,4,0,0,115,18,0,0,0,16,3,
+ 104,111,111,107,115,251,4,0,0,115,18,0,0,0,16,3,
 12,1,10,1,2,1,14,1,12,1,6,1,4,2,255,128,
 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,
@@ -2142,7 +2142,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,202,0,0,0,114,52,0,0,0,114,47,1,0,0,114,
 7,0,0,0,114,7,0,0,0,114,8,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,7,5,0,0,115,28,0,0,0,8,8,2,
+ 97,99,104,101,8,5,0,0,115,28,0,0,0,8,8,2,
 1,12,1,12,1,8,3,2,1,12,1,4,4,12,253,10,
 1,12,1,4,1,2,255,255,128,122,31,80,97,116,104,70,
 105,110,100,101,114,46,95,112,97,116,104,95,105,109,112,111,
@@ -2160,7 +2160,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,114,47,1,0,0,114,144,0,0,0,114,145,0,
 0,0,114,191,0,0,0,114,7,0,0,0,114,7,0,0,
 0,114,8,0,0,0,218,16,95,108,101,103,97,99,121,95,
- 103,101,116,95,115,112,101,99,29,5,0,0,115,20,0,0,
+ 103,101,116,95,115,112,101,99,30,5,0,0,115,20,0,0,
 0,10,4,16,1,10,2,4,1,8,1,12,1,12,1,6,
 1,4,1,255,128,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,
@@ -2192,7 +2192,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 90,5,101,110,116,114,121,114,47,1,0,0,114,191,0,0,
 0,114,145,0,0,0,114,7,0,0,0,114,7,0,0,0,
 114,8,0,0,0,218,9,95,103,101,116,95,115,112,101,99,
- 44,5,0,0,115,42,0,0,0,4,5,8,1,14,1,2,
+ 45,5,0,0,115,42,0,0,0,4,5,8,1,14,1,2,
 1,10,1,8,1,10,1,14,1,12,2,8,1,2,1,10,
 1,8,1,6,1,8,1,8,1,12,5,12,2,6,1,4,
 1,255,128,122,20,80,97,116,104,70,105,110,100,101,114,46,
@@ -2219,7 +2219,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,0,114,143,0,0,0,114,52,0,0,0,114,206,0,
 0,0,114,191,0,0,0,114,55,1,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,207,0,0,0,
- 76,5,0,0,115,28,0,0,0,8,6,6,1,14,1,8,
+ 77,5,0,0,115,28,0,0,0,8,6,6,1,14,1,8,
 1,4,1,10,1,6,1,4,1,6,3,16,1,4,1,4,
 2,4,2,255,128,122,20,80,97,116,104,70,105,110,100,101,
 114,46,102,105,110,100,95,115,112,101,99,99,3,0,0,0,
@@ -2239,7 +2239,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 40,41,32,105,110,115,116,101,97,100,46,10,10,32,32,32,
 32,32,32,32,32,78,114,208,0,0,0,114,209,0,0,0,
 114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,
- 210,0,0,0,100,5,0,0,115,10,0,0,0,12,8,8,
+ 210,0,0,0,101,5,0,0,115,10,0,0,0,12,8,8,
 1,4,1,6,1,255,128,122,22,80,97,116,104,70,105,110,
 100,101,114,46,102,105,110,100,95,109,111,100,117,108,101,99,
 0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,
@@ -2271,7 +2271,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 115,116,114,105,98,117,116,105,111,110,115,41,3,114,124,0,
 0,0,114,125,0,0,0,114,57,1,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,114,58,1,0,0,
- 113,5,0,0,115,6,0,0,0,12,10,16,1,255,128,122,
+ 114,5,0,0,115,6,0,0,0,12,10,16,1,255,128,122,
 29,80,97,116,104,70,105,110,100,101,114,46,102,105,110,100,
 95,100,105,115,116,114,105,98,117,116,105,111,110,115,41,1,
 78,41,2,78,78,41,1,78,41,14,114,130,0,0,0,114,
@@ -2280,7 +2280,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,0,114,52,1,0,0,114,53,1,0,0,114,56,1,0,
 0,114,207,0,0,0,114,210,0,0,0,114,58,1,0,0,
 114,7,0,0,0,114,7,0,0,0,114,7,0,0,0,114,
- 8,0,0,0,114,42,1,0,0,236,4,0,0,115,38,0,
+ 8,0,0,0,114,42,1,0,0,237,4,0,0,115,38,0,
 0,0,8,0,4,2,2,2,10,1,2,9,10,1,2,12,
 10,1,2,21,10,1,2,14,12,1,2,31,12,1,2,23,
 12,1,2,12,14,1,255,128,114,42,1,0,0,99,0,0,
@@ -2325,7 +2325,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 0,93,14,125,1,124,1,136,0,102,2,86,0,1,0,113,
 2,100,0,83,0,114,114,0,0,0,114,7,0,0,0,114,
 14,1,0,0,169,1,114,144,0,0,0,114,7,0,0,0,
- 114,8,0,0,0,114,9,0,0,0,142,5,0,0,115,6,
+ 114,8,0,0,0,114,9,0,0,0,143,5,0,0,115,6,
 0,0,0,18,0,4,128,255,128,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,
@@ -2338,7 +2338,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 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,193,0,0,0,
 114,7,0,0,0,114,60,1,0,0,114,8,0,0,0,114,
- 216,0,0,0,136,5,0,0,115,20,0,0,0,4,4,12,
+ 216,0,0,0,137,5,0,0,115,20,0,0,0,4,4,12,
 1,26,1,6,1,10,2,6,1,8,1,8,1,4,128,255,
 128,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,0,
@@ -2348,7 +2348,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 32,100,105,114,101,99,116,111,114,121,32,109,116,105,109,101,
 46,114,109,0,0,0,78,41,1,114,62,1,0,0,114,253,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,114,43,1,0,0,150,5,0,0,115,6,0,0,0,
+ 0,0,114,43,1,0,0,151,5,0,0,115,6,0,0,0,
 6,2,4,128,255,128,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,0,0,0,
@@ -2371,7 +2371,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 32,32,32,32,32,78,41,3,114,207,0,0,0,114,144,0,
 0,0,114,182,0,0,0,41,3,114,123,0,0,0,114,143,
 0,0,0,114,191,0,0,0,114,7,0,0,0,114,7,0,
- 0,0,114,8,0,0,0,114,141,0,0,0,156,5,0,0,
+ 0,0,114,8,0,0,0,114,141,0,0,0,157,5,0,0,
 115,10,0,0,0,10,7,8,1,8,1,16,1,255,128,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,
@@ -2382,7 +2382,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,123,0,0,0,114,192,0,0,0,114,143,0,0,0,114,
 52,0,0,0,90,4,115,109,115,108,114,206,0,0,0,114,
 144,0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,
- 0,0,0,114,56,1,0,0,168,5,0,0,115,10,0,0,
+ 0,0,0,114,56,1,0,0,169,5,0,0,115,10,0,0,
 0,10,1,8,1,2,1,6,255,255,128,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,0,0,0,0,14,
@@ -2436,7 +2436,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 104,114,15,1,0,0,114,192,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,191,0,0,0,114,7,0,0,0,114,
- 7,0,0,0,114,8,0,0,0,114,207,0,0,0,173,5,
+ 7,0,0,0,114,8,0,0,0,114,207,0,0,0,174,5,
 0,0,115,74,0,0,0,4,5,14,1,2,1,24,1,12,
 1,10,1,10,1,8,1,6,1,6,2,6,1,10,1,6,
 2,4,1,8,2,12,1,14,1,8,1,10,1,8,1,24,
@@ -2468,7 +2468,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 160,0,161,0,146,2,113,4,83,0,114,7,0,0,0,41,
 1,114,110,0,0,0,41,2,114,5,0,0,0,90,2,102,
 110,114,7,0,0,0,114,7,0,0,0,114,8,0,0,0,
- 114,13,0,0,0,250,5,0,0,115,4,0,0,0,20,0,
+ 114,13,0,0,0,251,5,0,0,115,4,0,0,0,20,0,
 255,128,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,
@@ -2485,7 +2485,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 110,116,101,110,116,115,114,38,1,0,0,114,121,0,0,0,
 114,25,1,0,0,114,15,1,0,0,90,8,110,101,119,95,
 110,97,109,101,114,7,0,0,0,114,7,0,0,0,114,8,
- 0,0,0,114,67,1,0,0,221,5,0,0,115,38,0,0,
+ 0,0,0,114,67,1,0,0,222,5,0,0,115,38,0,0,
 0,6,2,2,1,22,1,18,1,10,3,12,3,12,1,6,
 7,8,1,16,1,4,1,18,1,4,2,12,1,6,1,12,
 1,16,1,4,128,255,128,122,22,70,105,108,101,70,105,110,
@@ -2524,14 +2524,14 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 56,0,0,0,169,2,114,202,0,0,0,114,66,1,0,0,
 114,7,0,0,0,114,8,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,6,6,0,0,115,8,0,0,0,8,2,12,
+ 110,100,101,114,7,6,0,0,115,8,0,0,0,8,2,12,
 1,16,1,255,128,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,78,114,7,
 0,0,0,41,3,114,202,0,0,0,114,66,1,0,0,114,
 72,1,0,0,114,7,0,0,0,114,71,1,0,0,114,8,
- 0,0,0,218,9,112,97,116,104,95,104,111,111,107,252,5,
+ 0,0,0,218,9,112,97,116,104,95,104,111,111,107,253,5,
 0,0,115,6,0,0,0,14,10,4,6,255,128,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,0,0,0,0,
@@ -2540,7 +2540,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 122,16,70,105,108,101,70,105,110,100,101,114,40,123,33,114,
 125,41,41,2,114,70,0,0,0,114,52,0,0,0,114,253,
 0,0,0,114,7,0,0,0,114,7,0,0,0,114,8,0,
- 0,0,114,36,1,0,0,14,6,0,0,115,4,0,0,0,
+ 0,0,114,36,1,0,0,15,6,0,0,115,4,0,0,0,
 12,1,255,128,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,130,
 0,0,0,114,129,0,0,0,114,131,0,0,0,114,132,0,
@@ -2549,7 +2549,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 114,207,0,0,0,114,67,1,0,0,114,214,0,0,0,114,
 73,1,0,0,114,36,1,0,0,114,7,0,0,0,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,114,59,1,
- 0,0,127,5,0,0,115,26,0,0,0,8,0,4,2,8,
+ 0,0,128,5,0,0,115,26,0,0,0,8,0,4,2,8,
 7,8,14,4,4,8,2,8,12,10,5,8,48,2,31,10,
 1,12,17,255,128,114,59,1,0,0,99,4,0,0,0,0,
 0,0,0,0,0,0,0,6,0,0,0,8,0,0,0,67,
@@ -2572,7 +2572,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 97,116,104,110,97,109,101,90,9,99,112,97,116,104,110,97,
 109,101,114,144,0,0,0,114,191,0,0,0,114,7,0,0,
 0,114,7,0,0,0,114,8,0,0,0,218,14,95,102,105,
- 120,95,117,112,95,109,111,100,117,108,101,20,6,0,0,115,
+ 120,95,117,112,95,109,111,100,117,108,101,21,6,0,0,115,
 42,0,0,0,10,2,10,1,4,1,4,1,8,1,8,1,
 12,1,10,2,4,1,14,1,2,1,8,1,8,1,8,1,
 10,1,4,128,12,1,2,2,4,128,2,0,255,128,114,78,
@@ -2593,7 +2593,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 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,
 7,0,0,0,114,7,0,0,0,114,8,0,0,0,114,188,
- 0,0,0,43,6,0,0,115,10,0,0,0,12,5,8,1,
+ 0,0,0,44,6,0,0,115,10,0,0,0,12,5,8,1,
 8,1,10,1,255,128,114,188,0,0,0,99,1,0,0,0,
 0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,
 67,0,0,0,115,8,0,0,0,124,0,97,0,100,0,83,
@@ -2601,7 +2601,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 17,95,98,111,111,116,115,116,114,97,112,95,109,111,100,117,
 108,101,114,7,0,0,0,114,7,0,0,0,114,8,0,0,
 0,218,21,95,115,101,116,95,98,111,111,116,115,116,114,97,
- 112,95,109,111,100,117,108,101,54,6,0,0,115,6,0,0,
+ 112,95,109,111,100,117,108,101,55,6,0,0,115,6,0,0,
 0,4,2,4,128,255,128,114,81,1,0,0,99,1,0,0,
 0,0,0,0,0,0,0,0,0,2,0,0,0,4,0,0,
 0,67,0,0,0,115,50,0,0,0,116,0,124,0,131,1,
@@ -2617,7 +2617,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 42,1,0,0,41,2,114,80,1,0,0,90,17,115,117,112,
 112,111,114,116,101,100,95,108,111,97,100,101,114,115,114,7,
 0,0,0,114,7,0,0,0,114,8,0,0,0,218,8,95,
- 105,110,115,116,97,108,108,59,6,0,0,115,12,0,0,0,
+ 105,110,115,116,97,108,108,60,6,0,0,115,12,0,0,0,
 8,2,6,1,20,1,12,1,4,128,255,128,114,83,1,0,
 0,41,1,114,68,0,0,0,41,1,78,41,3,78,78,78,
 41,2,114,0,0,0,0,114,0,0,0,0,41,1,84,41,
@@ -2660,7 +2660,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
 1,6,2,22,2,8,1,10,1,14,1,4,4,4,1,2,
 1,2,1,4,255,8,4,6,16,8,3,8,5,8,5,8,
 6,8,6,8,12,8,10,8,9,8,5,8,7,10,9,10,
- 22,0,127,16,22,12,1,4,2,4,1,6,2,6,1,10,
+ 22,0,127,16,23,12,1,4,2,4,1,6,2,6,1,10,
 1,8,2,6,2,8,2,16,2,8,71,8,40,8,19,8,
 12,8,12,8,31,8,17,8,33,8,28,10,24,10,13,10,
 10,8,11,6,14,4,3,2,1,12,255,14,68,14,64,16,

---

• Previous message (by thread): [Python-checkins] Add more tests to the descriptor howto guide (GH-23506) (GH-23510)
• Next message (by thread): [Python-checkins] bpo-42392: Improve removal of *loop* parameter in asyncio primitives (GH-23499)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list