From af8566c84783a9c5cea852a2e4e2e729be7cf5a8 Mon Sep 17 00:00:00 2001 From: Eric Snow Date: Thu, 3 Oct 2013 12:08:55 -0600 Subject: [issue19152] Add ExtensionFileLoader.get_filename(). --- Doc/library/importlib.rst | 6 +- Lib/importlib/_bootstrap.py | 5 + Lib/importlib/abc.py | 2 + Misc/NEWS | 2 + Python/importlib.h | 402 +++++++++++++++++++++++--------------------- 5 files changed, 224 insertions(+), 193 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst index efd027b..78187b8 100644 --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -800,7 +800,7 @@ find and load modules. .. class:: ExtensionFileLoader(fullname, path) - A concrete implementation of :class:`importlib.abc.InspectLoader` for + A concrete implementation of :class:`importlib.abc.ExecutionLoader` for extension modules. The *fullname* argument specifies the name of the module the loader is to @@ -834,6 +834,10 @@ find and load modules. Returns ``None`` as extension modules do not have source code. + .. method:: get_filename(fullname) + + Returns :attr:`path`. + :mod:`importlib.util` -- Utility code for importers --------------------------------------------------- diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index e40ec92..83c51f8 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1153,6 +1153,11 @@ class ExtensionFileLoader: """Return None as extension modules have no source code.""" return None + @_check_name + def get_filename(self, fullname): + """Return the path to the source file as found by the finder.""" + return self.path + class _NamespacePath: """Represents a namespace package's path. It uses the module name diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index 387567a..438a01d 100644 --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -168,6 +168,8 @@ class ExecutionLoader(InspectLoader): set to.""" raise NotImplementedError +_register(machinery.ExtensionFileLoader) + class FileLoader(_bootstrap.FileLoader, ResourceLoader, ExecutionLoader): diff --git a/Misc/NEWS b/Misc/NEWS index 57507d9..ed6969c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -206,6 +206,8 @@ Library - Issue #19151: Fix docstring and use of _get_suppported_file_loaders() to reflect 2-tuples. +- Issue #19152: Add ExtensionFileLoader.get_filename(). + - Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get docstrings and ValueError messages. Patch by Zhongyue Luo diff --git a/Python/importlib.h b/Python/importlib.h index cb6afc5..5e92307 100644 --- a/Python/importlib.h +++ b/Python/importlib.h @@ -2645,161 +2645,179 @@ unsigned char _Py_M__importlib[] = { 0,16,2,6,2,12,3,12,12,117,20,0,0,0,83,111, 117,114,99,101,108,101,115,115,70,105,108,101,76,111,97,100, 101,114,99,1,0,0,0,0,0,0,0,1,0,0,0,5, - 0,0,0,66,0,0,0,115,104,0,0,0,124,0,0,69, + 0,0,0,66,0,0,0,115,122,0,0,0,124,0,0,69, 101,0,0,90,1,0,100,0,0,90,2,0,100,1,0,90, 3,0,100,2,0,100,3,0,132,0,0,90,4,0,101,5, 0,101,6,0,101,7,0,100,4,0,100,5,0,132,0,0, 131,1,0,131,1,0,131,1,0,90,8,0,100,6,0,100, 7,0,132,0,0,90,9,0,100,8,0,100,9,0,132,0, 0,90,10,0,100,10,0,100,11,0,132,0,0,90,11,0, - 100,12,0,83,40,13,0,0,0,117,19,0,0,0,69,120, - 116,101,110,115,105,111,110,70,105,108,101,76,111,97,100,101, - 114,117,93,0,0,0,76,111,97,100,101,114,32,102,111,114, + 101,5,0,100,12,0,100,13,0,132,0,0,131,1,0,90, + 12,0,100,14,0,83,40,15,0,0,0,117,19,0,0,0, + 69,120,116,101,110,115,105,111,110,70,105,108,101,76,111,97, + 100,101,114,117,93,0,0,0,76,111,97,100,101,114,32,102, + 111,114,32,101,120,116,101,110,115,105,111,110,32,109,111,100, + 117,108,101,115,46,10,10,32,32,32,32,84,104,101,32,99, + 111,110,115,116,114,117,99,116,111,114,32,105,115,32,100,101, + 115,105,103,110,101,100,32,116,111,32,119,111,114,107,32,119, + 105,116,104,32,70,105,108,101,70,105,110,100,101,114,46,10, + 10,32,32,32,32,99,3,0,0,0,0,0,0,0,3,0, + 0,0,2,0,0,0,67,0,0,0,115,22,0,0,0,124, + 1,0,124,0,0,95,0,0,124,2,0,124,0,0,95,1, + 0,100,0,0,83,40,1,0,0,0,78,40,2,0,0,0, + 117,4,0,0,0,110,97,109,101,117,4,0,0,0,112,97, + 116,104,40,3,0,0,0,117,4,0,0,0,115,101,108,102, + 117,4,0,0,0,110,97,109,101,117,4,0,0,0,112,97, + 116,104,40,0,0,0,0,40,0,0,0,0,117,29,0,0, + 0,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108, + 105,98,46,95,98,111,111,116,115,116,114,97,112,62,117,8, + 0,0,0,95,95,105,110,105,116,95,95,96,4,0,0,115, + 4,0,0,0,0,1,9,1,117,28,0,0,0,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,4,0,0,0,10,0,0,0,67,0,0,0,115,175, + 0,0,0,124,1,0,116,0,0,106,1,0,107,6,0,125, + 2,0,121,107,0,116,2,0,116,3,0,106,4,0,124,1, + 0,124,0,0,106,5,0,131,3,0,125,3,0,116,6,0, + 100,1,0,124,0,0,106,5,0,131,2,0,1,124,0,0, + 106,7,0,124,1,0,131,1,0,114,117,0,116,8,0,124, + 3,0,100,2,0,131,2,0,12,114,117,0,116,9,0,124, + 0,0,106,5,0,131,1,0,100,3,0,25,103,1,0,124, + 3,0,95,10,0,110,0,0,124,3,0,83,87,110,46,0, + 1,1,1,124,2,0,12,114,163,0,124,1,0,116,0,0, + 106,1,0,107,6,0,114,163,0,116,0,0,106,1,0,124, + 1,0,61,110,0,0,130,0,0,89,110,1,0,88,100,4, + 0,83,40,5,0,0,0,117,25,0,0,0,76,111,97,100, + 32,97,110,32,101,120,116,101,110,115,105,111,110,32,109,111, + 100,117,108,101,46,117,33,0,0,0,101,120,116,101,110,115, + 105,111,110,32,109,111,100,117,108,101,32,108,111,97,100,101, + 100,32,102,114,111,109,32,123,33,114,125,117,8,0,0,0, + 95,95,112,97,116,104,95,95,105,0,0,0,0,78,40,11, + 0,0,0,117,3,0,0,0,115,121,115,117,7,0,0,0, + 109,111,100,117,108,101,115,117,25,0,0,0,95,99,97,108, + 108,95,119,105,116,104,95,102,114,97,109,101,115,95,114,101, + 109,111,118,101,100,117,4,0,0,0,95,105,109,112,117,12, + 0,0,0,108,111,97,100,95,100,121,110,97,109,105,99,117, + 4,0,0,0,112,97,116,104,117,16,0,0,0,95,118,101, + 114,98,111,115,101,95,109,101,115,115,97,103,101,117,10,0, + 0,0,105,115,95,112,97,99,107,97,103,101,117,7,0,0, + 0,104,97,115,97,116,116,114,117,11,0,0,0,95,112,97, + 116,104,95,115,112,108,105,116,117,8,0,0,0,95,95,112, + 97,116,104,95,95,40,4,0,0,0,117,4,0,0,0,115, + 101,108,102,117,8,0,0,0,102,117,108,108,110,97,109,101, + 117,9,0,0,0,105,115,95,114,101,108,111,97,100,117,6, + 0,0,0,109,111,100,117,108,101,40,0,0,0,0,40,0, + 0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,32, + 105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,115, + 116,114,97,112,62,117,11,0,0,0,108,111,97,100,95,109, + 111,100,117,108,101,100,4,0,0,115,24,0,0,0,0,5, + 15,1,3,1,9,1,15,1,16,1,31,1,28,1,8,1, + 3,1,22,1,13,1,117,31,0,0,0,69,120,116,101,110, + 115,105,111,110,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,4,0,0,0,3,0,0,0,115, + 48,0,0,0,116,0,0,124,0,0,106,1,0,131,1,0, + 100,1,0,25,137,0,0,116,2,0,135,0,0,102,1,0, + 100,2,0,100,3,0,134,0,0,116,3,0,68,131,1,0, + 131,1,0,83,40,4,0,0,0,117,49,0,0,0,82,101, + 116,117,114,110,32,84,114,117,101,32,105,102,32,116,104,101, 32,101,120,116,101,110,115,105,111,110,32,109,111,100,117,108, - 101,115,46,10,10,32,32,32,32,84,104,101,32,99,111,110, - 115,116,114,117,99,116,111,114,32,105,115,32,100,101,115,105, - 103,110,101,100,32,116,111,32,119,111,114,107,32,119,105,116, - 104,32,70,105,108,101,70,105,110,100,101,114,46,10,10,32, - 32,32,32,99,3,0,0,0,0,0,0,0,3,0,0,0, - 2,0,0,0,67,0,0,0,115,22,0,0,0,124,1,0, - 124,0,0,95,0,0,124,2,0,124,0,0,95,1,0,100, - 0,0,83,40,1,0,0,0,78,40,2,0,0,0,117,4, - 0,0,0,110,97,109,101,117,4,0,0,0,112,97,116,104, - 40,3,0,0,0,117,4,0,0,0,115,101,108,102,117,4, - 0,0,0,110,97,109,101,117,4,0,0,0,112,97,116,104, - 40,0,0,0,0,40,0,0,0,0,117,29,0,0,0,60, - 102,114,111,122,101,110,32,105,109,112,111,114,116,108,105,98, - 46,95,98,111,111,116,115,116,114,97,112,62,117,8,0,0, - 0,95,95,105,110,105,116,95,95,96,4,0,0,115,4,0, - 0,0,0,1,9,1,117,28,0,0,0,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, - 4,0,0,0,10,0,0,0,67,0,0,0,115,175,0,0, - 0,124,1,0,116,0,0,106,1,0,107,6,0,125,2,0, - 121,107,0,116,2,0,116,3,0,106,4,0,124,1,0,124, - 0,0,106,5,0,131,3,0,125,3,0,116,6,0,100,1, - 0,124,0,0,106,5,0,131,2,0,1,124,0,0,106,7, - 0,124,1,0,131,1,0,114,117,0,116,8,0,124,3,0, - 100,2,0,131,2,0,12,114,117,0,116,9,0,124,0,0, - 106,5,0,131,1,0,100,3,0,25,103,1,0,124,3,0, - 95,10,0,110,0,0,124,3,0,83,87,110,46,0,1,1, - 1,124,2,0,12,114,163,0,124,1,0,116,0,0,106,1, - 0,107,6,0,114,163,0,116,0,0,106,1,0,124,1,0, - 61,110,0,0,130,0,0,89,110,1,0,88,100,4,0,83, - 40,5,0,0,0,117,25,0,0,0,76,111,97,100,32,97, + 101,32,105,115,32,97,32,112,97,99,107,97,103,101,46,105, + 1,0,0,0,99,1,0,0,0,0,0,0,0,2,0,0, + 0,4,0,0,0,51,0,0,0,115,31,0,0,0,124,0, + 0,93,21,0,125,1,0,136,0,0,100,0,0,124,1,0, + 23,107,2,0,86,1,113,3,0,100,1,0,83,40,2,0, + 0,0,117,8,0,0,0,95,95,105,110,105,116,95,95,78, + 40,0,0,0,0,40,2,0,0,0,117,2,0,0,0,46, + 48,117,6,0,0,0,115,117,102,102,105,120,40,1,0,0, + 0,117,9,0,0,0,102,105,108,101,95,110,97,109,101,40, + 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, + 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, + 115,116,114,97,112,62,117,9,0,0,0,60,103,101,110,101, + 120,112,114,62,121,4,0,0,115,2,0,0,0,6,1,117, + 49,0,0,0,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,40,4,0,0,0,117,11,0,0,0,95, + 112,97,116,104,95,115,112,108,105,116,117,4,0,0,0,112, + 97,116,104,117,3,0,0,0,97,110,121,117,18,0,0,0, + 69,88,84,69,78,83,73,79,78,95,83,85,70,70,73,88, + 69,83,40,2,0,0,0,117,4,0,0,0,115,101,108,102, + 117,8,0,0,0,102,117,108,108,110,97,109,101,40,0,0, + 0,0,40,1,0,0,0,117,9,0,0,0,102,105,108,101, + 95,110,97,109,101,117,29,0,0,0,60,102,114,111,122,101, + 110,32,105,109,112,111,114,116,108,105,98,46,95,98,111,111, + 116,115,116,114,97,112,62,117,10,0,0,0,105,115,95,112, + 97,99,107,97,103,101,118,4,0,0,115,6,0,0,0,0, + 2,19,1,18,1,117,30,0,0,0,69,120,116,101,110,115, + 105,111,110,70,105,108,101,76,111,97,100,101,114,46,105,115, + 95,112,97,99,107,97,103,101,99,2,0,0,0,0,0,0, + 0,2,0,0,0,1,0,0,0,67,0,0,0,115,4,0, + 0,0,100,1,0,83,40,2,0,0,0,117,63,0,0,0, + 82,101,116,117,114,110,32,78,111,110,101,32,97,115,32,97, 110,32,101,120,116,101,110,115,105,111,110,32,109,111,100,117, - 108,101,46,117,33,0,0,0,101,120,116,101,110,115,105,111, - 110,32,109,111,100,117,108,101,32,108,111,97,100,101,100,32, - 102,114,111,109,32,123,33,114,125,117,8,0,0,0,95,95, - 112,97,116,104,95,95,105,0,0,0,0,78,40,11,0,0, - 0,117,3,0,0,0,115,121,115,117,7,0,0,0,109,111, - 100,117,108,101,115,117,25,0,0,0,95,99,97,108,108,95, - 119,105,116,104,95,102,114,97,109,101,115,95,114,101,109,111, - 118,101,100,117,4,0,0,0,95,105,109,112,117,12,0,0, - 0,108,111,97,100,95,100,121,110,97,109,105,99,117,4,0, - 0,0,112,97,116,104,117,16,0,0,0,95,118,101,114,98, - 111,115,101,95,109,101,115,115,97,103,101,117,10,0,0,0, - 105,115,95,112,97,99,107,97,103,101,117,7,0,0,0,104, - 97,115,97,116,116,114,117,11,0,0,0,95,112,97,116,104, - 95,115,112,108,105,116,117,8,0,0,0,95,95,112,97,116, - 104,95,95,40,4,0,0,0,117,4,0,0,0,115,101,108, - 102,117,8,0,0,0,102,117,108,108,110,97,109,101,117,9, - 0,0,0,105,115,95,114,101,108,111,97,100,117,6,0,0, - 0,109,111,100,117,108,101,40,0,0,0,0,40,0,0,0, - 0,117,29,0,0,0,60,102,114,111,122,101,110,32,105,109, - 112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,114, - 97,112,62,117,11,0,0,0,108,111,97,100,95,109,111,100, - 117,108,101,100,4,0,0,115,24,0,0,0,0,5,15,1, - 3,1,9,1,15,1,16,1,31,1,28,1,8,1,3,1, - 22,1,13,1,117,31,0,0,0,69,120,116,101,110,115,105, - 111,110,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,4,0,0,0,3,0,0,0,115,48,0, - 0,0,116,0,0,124,0,0,106,1,0,131,1,0,100,1, - 0,25,137,0,0,116,2,0,135,0,0,102,1,0,100,2, - 0,100,3,0,134,0,0,116,3,0,68,131,1,0,131,1, - 0,83,40,4,0,0,0,117,49,0,0,0,82,101,116,117, - 114,110,32,84,114,117,101,32,105,102,32,116,104,101,32,101, - 120,116,101,110,115,105,111,110,32,109,111,100,117,108,101,32, - 105,115,32,97,32,112,97,99,107,97,103,101,46,105,1,0, - 0,0,99,1,0,0,0,0,0,0,0,2,0,0,0,4, - 0,0,0,51,0,0,0,115,31,0,0,0,124,0,0,93, - 21,0,125,1,0,136,0,0,100,0,0,124,1,0,23,107, - 2,0,86,1,113,3,0,100,1,0,83,40,2,0,0,0, - 117,8,0,0,0,95,95,105,110,105,116,95,95,78,40,0, - 0,0,0,40,2,0,0,0,117,2,0,0,0,46,48,117, - 6,0,0,0,115,117,102,102,105,120,40,1,0,0,0,117, - 9,0,0,0,102,105,108,101,95,110,97,109,101,40,0,0, - 0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, - 109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, - 114,97,112,62,117,9,0,0,0,60,103,101,110,101,120,112, - 114,62,121,4,0,0,115,2,0,0,0,6,1,117,49,0, - 0,0,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,40,4,0,0,0,117,11,0,0,0,95,112,97, - 116,104,95,115,112,108,105,116,117,4,0,0,0,112,97,116, - 104,117,3,0,0,0,97,110,121,117,18,0,0,0,69,88, - 84,69,78,83,73,79,78,95,83,85,70,70,73,88,69,83, - 40,2,0,0,0,117,4,0,0,0,115,101,108,102,117,8, - 0,0,0,102,117,108,108,110,97,109,101,40,0,0,0,0, - 40,1,0,0,0,117,9,0,0,0,102,105,108,101,95,110, - 97,109,101,117,29,0,0,0,60,102,114,111,122,101,110,32, + 108,101,32,99,97,110,110,111,116,32,99,114,101,97,116,101, + 32,97,32,99,111,100,101,32,111,98,106,101,99,116,46,78, + 40,1,0,0,0,117,4,0,0,0,78,111,110,101,40,2, + 0,0,0,117,4,0,0,0,115,101,108,102,117,8,0,0, + 0,102,117,108,108,110,97,109,101,40,0,0,0,0,40,0, + 0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,32, 105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,115, - 116,114,97,112,62,117,10,0,0,0,105,115,95,112,97,99, - 107,97,103,101,118,4,0,0,115,6,0,0,0,0,2,19, - 1,18,1,117,30,0,0,0,69,120,116,101,110,115,105,111, - 110,70,105,108,101,76,111,97,100,101,114,46,105,115,95,112, - 97,99,107,97,103,101,99,2,0,0,0,0,0,0,0,2, - 0,0,0,1,0,0,0,67,0,0,0,115,4,0,0,0, - 100,1,0,83,40,2,0,0,0,117,63,0,0,0,82,101, - 116,117,114,110,32,78,111,110,101,32,97,115,32,97,110,32, - 101,120,116,101,110,115,105,111,110,32,109,111,100,117,108,101, - 32,99,97,110,110,111,116,32,99,114,101,97,116,101,32,97, - 32,99,111,100,101,32,111,98,106,101,99,116,46,78,40,1, - 0,0,0,117,4,0,0,0,78,111,110,101,40,2,0,0, - 0,117,4,0,0,0,115,101,108,102,117,8,0,0,0,102, - 117,108,108,110,97,109,101,40,0,0,0,0,40,0,0,0, - 0,117,29,0,0,0,60,102,114,111,122,101,110,32,105,109, - 112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,114, - 97,112,62,117,8,0,0,0,103,101,116,95,99,111,100,101, - 124,4,0,0,115,2,0,0,0,0,2,117,28,0,0,0, + 116,114,97,112,62,117,8,0,0,0,103,101,116,95,99,111, + 100,101,124,4,0,0,115,2,0,0,0,0,2,117,28,0, + 0,0,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,0,0,0,100,1,0,83,40,2,0,0, + 0,117,53,0,0,0,82,101,116,117,114,110,32,78,111,110, + 101,32,97,115,32,101,120,116,101,110,115,105,111,110,32,109, + 111,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,40,1,0,0, + 0,117,4,0,0,0,78,111,110,101,40,2,0,0,0,117, + 4,0,0,0,115,101,108,102,117,8,0,0,0,102,117,108, + 108,110,97,109,101,40,0,0,0,0,40,0,0,0,0,117, + 29,0,0,0,60,102,114,111,122,101,110,32,105,109,112,111, + 114,116,108,105,98,46,95,98,111,111,116,115,116,114,97,112, + 62,117,10,0,0,0,103,101,116,95,115,111,117,114,99,101, + 128,4,0,0,115,2,0,0,0,0,2,117,30,0,0,0, 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,0,0,0,100,1,0,83,40,2,0,0,0,117, - 53,0,0,0,82,101,116,117,114,110,32,78,111,110,101,32, - 97,115,32,101,120,116,101,110,115,105,111,110,32,109,111,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,40,1,0,0,0,117, - 4,0,0,0,78,111,110,101,40,2,0,0,0,117,4,0, - 0,0,115,101,108,102,117,8,0,0,0,102,117,108,108,110, - 97,109,101,40,0,0,0,0,40,0,0,0,0,117,29,0, - 0,0,60,102,114,111,122,101,110,32,105,109,112,111,114,116, - 108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,117, - 10,0,0,0,103,101,116,95,115,111,117,114,99,101,128,4, - 0,0,115,2,0,0,0,0,2,117,30,0,0,0,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,78,40,12,0, - 0,0,117,8,0,0,0,95,95,110,97,109,101,95,95,117, - 10,0,0,0,95,95,109,111,100,117,108,101,95,95,117,12, - 0,0,0,95,95,113,117,97,108,110,97,109,101,95,95,117, - 7,0,0,0,95,95,100,111,99,95,95,117,8,0,0,0, - 95,95,105,110,105,116,95,95,117,11,0,0,0,95,99,104, - 101,99,107,95,110,97,109,101,117,11,0,0,0,115,101,116, - 95,112,97,99,107,97,103,101,117,10,0,0,0,115,101,116, - 95,108,111,97,100,101,114,117,11,0,0,0,108,111,97,100, - 95,109,111,100,117,108,101,117,10,0,0,0,105,115,95,112, - 97,99,107,97,103,101,117,8,0,0,0,103,101,116,95,99, - 111,100,101,117,10,0,0,0,103,101,116,95,115,111,117,114, - 99,101,40,1,0,0,0,117,10,0,0,0,95,95,108,111, - 99,97,108,115,95,95,40,0,0,0,0,40,0,0,0,0, - 117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112, - 111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97, - 112,62,117,19,0,0,0,69,120,116,101,110,115,105,111,110, - 70,105,108,101,76,111,97,100,101,114,88,4,0,0,115,16, - 0,0,0,16,6,6,2,12,4,3,1,3,1,24,16,12, - 6,12,4,117,19,0,0,0,69,120,116,101,110,115,105,111, + 100,101,114,46,103,101,116,95,115,111,117,114,99,101,99,2, + 0,0,0,0,0,0,0,2,0,0,0,1,0,0,0,67, + 0,0,0,115,7,0,0,0,124,0,0,106,0,0,83,40, + 1,0,0,0,117,58,0,0,0,82,101,116,117,114,110,32, + 116,104,101,32,112,97,116,104,32,116,111,32,116,104,101,32, + 115,111,117,114,99,101,32,102,105,108,101,32,97,115,32,102, + 111,117,110,100,32,98,121,32,116,104,101,32,102,105,110,100, + 101,114,46,40,1,0,0,0,117,4,0,0,0,112,97,116, + 104,40,2,0,0,0,117,4,0,0,0,115,101,108,102,117, + 8,0,0,0,102,117,108,108,110,97,109,101,40,0,0,0, + 0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122, + 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111, + 111,116,115,116,114,97,112,62,117,12,0,0,0,103,101,116, + 95,102,105,108,101,110,97,109,101,132,4,0,0,115,2,0, + 0,0,0,3,117,32,0,0,0,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,40,13,0,0,0,117, + 8,0,0,0,95,95,110,97,109,101,95,95,117,10,0,0, + 0,95,95,109,111,100,117,108,101,95,95,117,12,0,0,0, + 95,95,113,117,97,108,110,97,109,101,95,95,117,7,0,0, + 0,95,95,100,111,99,95,95,117,8,0,0,0,95,95,105, + 110,105,116,95,95,117,11,0,0,0,95,99,104,101,99,107, + 95,110,97,109,101,117,11,0,0,0,115,101,116,95,112,97, + 99,107,97,103,101,117,10,0,0,0,115,101,116,95,108,111, + 97,100,101,114,117,11,0,0,0,108,111,97,100,95,109,111, + 100,117,108,101,117,10,0,0,0,105,115,95,112,97,99,107, + 97,103,101,117,8,0,0,0,103,101,116,95,99,111,100,101, + 117,10,0,0,0,103,101,116,95,115,111,117,114,99,101,117, + 12,0,0,0,103,101,116,95,102,105,108,101,110,97,109,101, + 40,1,0,0,0,117,10,0,0,0,95,95,108,111,99,97, + 108,115,95,95,40,0,0,0,0,40,0,0,0,0,117,29, + 0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,114, + 116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,62, + 117,19,0,0,0,69,120,116,101,110,115,105,111,110,70,105, + 108,101,76,111,97,100,101,114,88,4,0,0,115,18,0,0, + 0,16,6,6,2,12,4,3,1,3,1,24,16,12,6,12, + 4,12,4,117,19,0,0,0,69,120,116,101,110,115,105,111, 110,70,105,108,101,76,111,97,100,101,114,99,1,0,0,0, 0,0,0,0,1,0,0,0,2,0,0,0,66,0,0,0, 115,134,0,0,0,124,0,0,69,101,0,0,90,1,0,100, @@ -2848,7 +2866,7 @@ unsigned char _Py_M__importlib[] = { 114,40,0,0,0,0,40,0,0,0,0,117,29,0,0,0, 60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,105, 98,46,95,98,111,111,116,115,116,114,97,112,62,117,8,0, - 0,0,95,95,105,110,105,116,95,95,140,4,0,0,115,8, + 0,0,95,95,105,110,105,116,95,95,145,4,0,0,115,8, 0,0,0,0,1,9,1,9,1,21,1,117,23,0,0,0, 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, @@ -2873,7 +2891,7 @@ unsigned char _Py_M__importlib[] = { 0,0,60,102,114,111,122,101,110,32,105,109,112,111,114,116, 108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,117, 23,0,0,0,95,102,105,110,100,95,112,97,114,101,110,116, - 95,112,97,116,104,95,110,97,109,101,115,146,4,0,0,115, + 95,112,97,116,104,95,110,97,109,101,115,151,4,0,0,115, 8,0,0,0,0,2,27,1,12,2,4,3,117,38,0,0, 0,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, @@ -2893,7 +2911,7 @@ unsigned char _Py_M__importlib[] = { 117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112, 111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97, 112,62,117,16,0,0,0,95,103,101,116,95,112,97,114,101, - 110,116,95,112,97,116,104,156,4,0,0,115,4,0,0,0, + 110,116,95,112,97,116,104,161,4,0,0,115,4,0,0,0, 0,1,18,1,117,31,0,0,0,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, @@ -2918,7 +2936,7 @@ unsigned char _Py_M__importlib[] = { 0,0,40,0,0,0,0,117,29,0,0,0,60,102,114,111, 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,12,0,0,0,95,114, - 101,99,97,108,99,117,108,97,116,101,160,4,0,0,115,14, + 101,99,97,108,99,117,108,97,116,101,165,4,0,0,115,14, 0,0,0,0,2,18,1,15,1,27,3,12,1,12,1,12, 1,117,27,0,0,0,95,78,97,109,101,115,112,97,99,101, 80,97,116,104,46,95,114,101,99,97,108,99,117,108,97,116, @@ -2931,7 +2949,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,40,0,0,0,0,117,29,0,0,0,60,102,114, 111,122,101,110,32,105,109,112,111,114,116,108,105,98,46,95, 98,111,111,116,115,116,114,97,112,62,117,8,0,0,0,95, - 95,105,116,101,114,95,95,172,4,0,0,115,2,0,0,0, + 95,105,116,101,114,95,95,177,4,0,0,115,2,0,0,0, 0,1,117,23,0,0,0,95,78,97,109,101,115,112,97,99, 101,80,97,116,104,46,95,95,105,116,101,114,95,95,99,1, 0,0,0,0,0,0,0,1,0,0,0,2,0,0,0,67, @@ -2943,7 +2961,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,7,0,0,0,95,95,108,101,110, - 95,95,175,4,0,0,115,2,0,0,0,0,1,117,22,0, + 95,95,180,4,0,0,115,2,0,0,0,0,1,117,22,0, 0,0,95,78,97,109,101,115,112,97,99,101,80,97,116,104, 46,95,95,108,101,110,95,95,99,1,0,0,0,0,0,0, 0,1,0,0,0,2,0,0,0,67,0,0,0,115,16,0, @@ -2956,7 +2974,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,32, 105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,115, 116,114,97,112,62,117,8,0,0,0,95,95,114,101,112,114, - 95,95,178,4,0,0,115,2,0,0,0,0,1,117,23,0, + 95,95,183,4,0,0,115,2,0,0,0,0,1,117,23,0, 0,0,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,0,0,115,16, @@ -2968,7 +2986,7 @@ unsigned char _Py_M__importlib[] = { 117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112, 111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97, 112,62,117,12,0,0,0,95,95,99,111,110,116,97,105,110, - 115,95,95,181,4,0,0,115,2,0,0,0,0,1,117,27, + 115,95,95,186,4,0,0,115,2,0,0,0,0,1,117,27, 0,0,0,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,67, @@ -2980,7 +2998,7 @@ unsigned char _Py_M__importlib[] = { 116,101,109,40,0,0,0,0,40,0,0,0,0,117,29,0, 0,0,60,102,114,111,122,101,110,32,105,109,112,111,114,116, 108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,117, - 6,0,0,0,97,112,112,101,110,100,184,4,0,0,115,2, + 6,0,0,0,97,112,112,101,110,100,189,4,0,0,115,2, 0,0,0,0,1,117,21,0,0,0,95,78,97,109,101,115, 112,97,99,101,80,97,116,104,46,97,112,112,101,110,100,78, 40,13,0,0,0,117,8,0,0,0,95,95,110,97,109,101, @@ -3001,7 +3019,7 @@ unsigned char _Py_M__importlib[] = { 0,0,60,102,114,111,122,101,110,32,105,109,112,111,114,116, 108,105,98,46,95,98,111,111,116,115,116,114,97,112,62,117, 14,0,0,0,95,78,97,109,101,115,112,97,99,101,80,97, - 116,104,133,4,0,0,115,20,0,0,0,16,5,6,2,12, + 116,104,138,4,0,0,115,20,0,0,0,16,5,6,2,12, 6,12,10,12,4,12,12,12,3,12,3,12,3,12,3,117, 14,0,0,0,95,78,97,109,101,115,112,97,99,101,80,97, 116,104,99,1,0,0,0,0,0,0,0,1,0,0,0,3, @@ -3023,7 +3041,7 @@ unsigned char _Py_M__importlib[] = { 110,100,101,114,40,0,0,0,0,40,0,0,0,0,117,29, 0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,114, 116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,62, - 117,8,0,0,0,95,95,105,110,105,116,95,95,189,4,0, + 117,8,0,0,0,95,95,105,110,105,116,95,95,194,4,0, 0,115,2,0,0,0,0,1,117,24,0,0,0,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, @@ -3038,7 +3056,7 @@ unsigned char _Py_M__importlib[] = { 0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, 109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, 114,97,112,62,117,11,0,0,0,109,111,100,117,108,101,95, - 114,101,112,114,192,4,0,0,115,2,0,0,0,0,2,117, + 114,101,112,114,197,4,0,0,115,2,0,0,0,0,2,117, 27,0,0,0,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,3,0,0,0, @@ -3057,7 +3075,7 @@ unsigned char _Py_M__importlib[] = { 40,0,0,0,0,40,0,0,0,0,117,29,0,0,0,60, 102,114,111,122,101,110,32,105,109,112,111,114,116,108,105,98, 46,95,98,111,111,116,115,116,114,97,112,62,117,11,0,0, - 0,108,111,97,100,95,109,111,100,117,108,101,196,4,0,0, + 0,108,111,97,100,95,109,111,100,117,108,101,201,4,0,0, 115,6,0,0,0,0,3,16,1,12,1,117,27,0,0,0, 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,40,8,0,0, @@ -3074,7 +3092,7 @@ unsigned char _Py_M__importlib[] = { 29,0,0,0,60,102,114,111,122,101,110,32,105,109,112,111, 114,116,108,105,98,46,95,98,111,111,116,115,116,114,97,112, 62,117,15,0,0,0,78,97,109,101,115,112,97,99,101,76, - 111,97,100,101,114,188,4,0,0,115,6,0,0,0,16,1, + 111,97,100,101,114,193,4,0,0,115,6,0,0,0,16,1, 12,3,18,4,117,15,0,0,0,78,97,109,101,115,112,97, 99,101,76,111,97,100,101,114,99,1,0,0,0,0,0,0, 0,1,0,0,0,4,0,0,0,66,0,0,0,115,119,0, @@ -3116,7 +3134,7 @@ unsigned char _Py_M__importlib[] = { 0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122, 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111, 111,116,115,116,114,97,112,62,117,17,0,0,0,105,110,118, - 97,108,105,100,97,116,101,95,99,97,99,104,101,115,210,4, + 97,108,105,100,97,116,101,95,99,97,99,104,101,115,215,4, 0,0,115,6,0,0,0,0,4,22,1,15,1,117,28,0, 0,0,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, @@ -3148,7 +3166,7 @@ unsigned char _Py_M__importlib[] = { 40,0,0,0,0,117,29,0,0,0,60,102,114,111,122,101, 110,32,105,109,112,111,114,116,108,105,98,46,95,98,111,111, 116,115,116,114,97,112,62,117,11,0,0,0,95,112,97,116, - 104,95,104,111,111,107,115,218,4,0,0,115,16,0,0,0, + 104,95,104,111,111,107,115,223,4,0,0,115,16,0,0,0, 0,7,9,1,19,1,16,1,3,1,14,1,13,1,12,2, 117,22,0,0,0,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, @@ -3183,7 +3201,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,20,0,0,0,95,112,97,116,104, - 95,105,109,112,111,114,116,101,114,95,99,97,99,104,101,235, + 95,105,109,112,111,114,116,101,114,95,99,97,99,104,101,240, 4,0,0,115,16,0,0,0,0,8,12,1,9,1,3,1, 17,1,13,1,15,1,18,1,117,31,0,0,0,80,97,116, 104,70,105,110,100,101,114,46,95,112,97,116,104,95,105,109, @@ -3224,7 +3242,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,40,0,0,0,0,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,11,0,0,0, - 95,103,101,116,95,108,111,97,100,101,114,252,4,0,0,115, + 95,103,101,116,95,108,111,97,100,101,114,1,5,0,0,115, 28,0,0,0,0,5,6,1,13,1,21,1,6,1,15,1, 12,1,15,1,24,2,15,1,6,1,12,2,10,5,20,2, 117,22,0,0,0,80,97,116,104,70,105,110,100,101,114,46, @@ -3255,7 +3273,7 @@ unsigned char _Py_M__importlib[] = { 0,117,29,0,0,0,60,102,114,111,122,101,110,32,105,109, 112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,114, 97,112,62,117,11,0,0,0,102,105,110,100,95,109,111,100, - 117,108,101,23,5,0,0,115,16,0,0,0,0,4,12,1, + 117,108,101,28,5,0,0,115,16,0,0,0,0,4,12,1, 12,1,24,1,12,1,4,2,6,3,19,2,117,22,0,0, 0,80,97,116,104,70,105,110,100,101,114,46,102,105,110,100, 95,109,111,100,117,108,101,78,40,11,0,0,0,117,8,0, @@ -3274,7 +3292,7 @@ unsigned char _Py_M__importlib[] = { 95,95,40,0,0,0,0,40,0,0,0,0,117,29,0,0, 0,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108, 105,98,46,95,98,111,111,116,115,116,114,97,112,62,117,10, - 0,0,0,80,97,116,104,70,105,110,100,101,114,206,4,0, + 0,0,0,80,97,116,104,70,105,110,100,101,114,211,4,0, 0,115,14,0,0,0,16,2,6,2,18,8,18,17,18,17, 18,27,3,1,117,10,0,0,0,80,97,116,104,70,105,110, 100,101,114,99,1,0,0,0,0,0,0,0,1,0,0,0, @@ -3327,7 +3345,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,9,0,0,0,60,103,101,110,101, - 120,112,114,62,56,5,0,0,115,2,0,0,0,6,0,117, + 120,112,114,62,61,5,0,0,115,2,0,0,0,6,0,117, 38,0,0,0,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,117,1,0,0,0,46, @@ -3346,7 +3364,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,108,111,97,100,101,114,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,8,0,0,0, - 95,95,105,110,105,116,95,95,50,5,0,0,115,16,0,0, + 95,95,105,110,105,116,95,95,55,5,0,0,115,16,0,0, 0,0,4,6,1,19,1,36,1,9,2,15,1,9,1,12, 1,117,19,0,0,0,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, @@ -3361,7 +3379,7 @@ unsigned char _Py_M__importlib[] = { 0,117,29,0,0,0,60,102,114,111,122,101,110,32,105,109, 112,111,114,116,108,105,98,46,95,98,111,111,116,115,116,114, 97,112,62,117,17,0,0,0,105,110,118,97,108,105,100,97, - 116,101,95,99,97,99,104,101,115,64,5,0,0,115,2,0, + 116,101,95,99,97,99,104,101,115,69,5,0,0,115,2,0, 0,0,0,2,117,28,0,0,0,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,12,0, @@ -3442,7 +3460,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,114, 116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,62, 117,11,0,0,0,102,105,110,100,95,108,111,97,100,101,114, - 70,5,0,0,115,66,0,0,0,0,3,6,1,19,1,3, + 75,5,0,0,115,66,0,0,0,0,3,6,1,19,1,3, 1,25,1,13,1,11,1,15,1,10,1,12,2,9,1,9, 1,15,2,9,1,6,2,12,1,18,1,12,1,22,1,10, 1,15,1,12,1,26,4,12,2,22,1,22,1,25,1,16, @@ -3482,7 +3500,7 @@ unsigned char _Py_M__importlib[] = { 40,0,0,0,0,117,29,0,0,0,60,102,114,111,122,101, 110,32,105,109,112,111,114,116,108,105,98,46,95,98,111,111, 116,115,116,114,97,112,62,117,9,0,0,0,60,103,101,110, - 101,120,112,114,62,143,5,0,0,115,2,0,0,0,6,0, + 101,120,112,114,62,148,5,0,0,115,2,0,0,0,6,0, 117,41,0,0,0,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,103,101,110,101,120,112,114,62,78,40, @@ -3512,7 +3530,7 @@ unsigned char _Py_M__importlib[] = { 101,40,0,0,0,0,40,0,0,0,0,117,29,0,0,0, 60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,105, 98,46,95,98,111,111,116,115,116,114,97,112,62,117,11,0, - 0,0,95,102,105,108,108,95,99,97,99,104,101,114,5,0, + 0,0,95,102,105,108,108,95,99,97,99,104,101,119,5,0, 0,115,34,0,0,0,0,2,9,1,3,1,19,1,22,3, 11,3,18,1,18,7,9,1,13,1,24,1,6,1,27,2, 6,1,17,1,9,1,18,1,117,22,0,0,0,70,105,108, @@ -3558,7 +3576,7 @@ unsigned char _Py_M__importlib[] = { 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,24,0,0,0,112,97, 116,104,95,104,111,111,107,95,102,111,114,95,70,105,108,101, - 70,105,110,100,101,114,155,5,0,0,115,6,0,0,0,0, + 70,105,110,100,101,114,160,5,0,0,115,6,0,0,0,0, 2,12,1,21,1,117,54,0,0,0,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, @@ -3572,7 +3590,7 @@ unsigned char _Py_M__importlib[] = { 100,101,116,97,105,108,115,117,29,0,0,0,60,102,114,111, 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,9,0,0,0,112,97, - 116,104,95,104,111,111,107,145,5,0,0,115,4,0,0,0, + 116,104,95,104,111,111,107,150,5,0,0,115,4,0,0,0, 0,10,21,6,117,20,0,0,0,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, @@ -3584,7 +3602,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,8,0,0,0,95,95,114,101,112, - 114,95,95,163,5,0,0,115,2,0,0,0,0,1,117,19, + 114,95,95,168,5,0,0,115,2,0,0,0,0,1,117,19, 0,0,0,70,105,108,101,70,105,110,100,101,114,46,95,95, 114,101,112,114,95,95,78,40,13,0,0,0,117,8,0,0, 0,95,95,110,97,109,101,95,95,117,10,0,0,0,95,95, @@ -3604,7 +3622,7 @@ unsigned char _Py_M__importlib[] = { 0,0,40,0,0,0,0,117,29,0,0,0,60,102,114,111, 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,10,0,0,0,70,105, - 108,101,70,105,110,100,101,114,41,5,0,0,115,16,0,0, + 108,101,70,105,110,100,101,114,46,5,0,0,115,16,0,0, 0,16,7,6,2,12,14,12,4,6,2,12,44,12,31,18, 18,117,10,0,0,0,70,105,108,101,70,105,110,100,101,114, 99,1,0,0,0,0,0,0,0,1,0,0,0,2,0,0, @@ -3627,7 +3645,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,32, 105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,115, 116,114,97,112,62,117,9,0,0,0,95,95,101,110,116,101, - 114,95,95,173,5,0,0,115,2,0,0,0,0,2,117,28, + 114,95,95,178,5,0,0,115,2,0,0,0,0,2,117,28, 0,0,0,95,73,109,112,111,114,116,76,111,99,107,67,111, 110,116,101,120,116,46,95,95,101,110,116,101,114,95,95,99, 4,0,0,0,0,0,0,0,4,0,0,0,1,0,0,0, @@ -3646,7 +3664,7 @@ unsigned char _Py_M__importlib[] = { 0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, 109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, 114,97,112,62,117,8,0,0,0,95,95,101,120,105,116,95, - 95,177,5,0,0,115,2,0,0,0,0,2,117,27,0,0, + 95,182,5,0,0,115,2,0,0,0,0,2,117,27,0,0, 0,95,73,109,112,111,114,116,76,111,99,107,67,111,110,116, 101,120,116,46,95,95,101,120,105,116,95,95,78,40,6,0, 0,0,117,8,0,0,0,95,95,110,97,109,101,95,95,117, @@ -3659,7 +3677,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,18,0,0,0,95,73,109,112,111, - 114,116,76,111,99,107,67,111,110,116,101,120,116,169,5,0, + 114,116,76,111,99,107,67,111,110,116,101,120,116,174,5,0, 0,115,6,0,0,0,16,2,6,2,12,4,117,18,0,0, 0,95,73,109,112,111,114,116,76,111,99,107,67,111,110,116, 101,120,116,99,3,0,0,0,0,0,0,0,5,0,0,0, @@ -3688,7 +3706,7 @@ unsigned char _Py_M__importlib[] = { 0,0,40,0,0,0,0,117,29,0,0,0,60,102,114,111, 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,13,0,0,0,95,114, - 101,115,111,108,118,101,95,110,97,109,101,182,5,0,0,115, + 101,115,111,108,118,101,95,110,97,109,101,187,5,0,0,115, 10,0,0,0,0,2,22,1,18,1,15,1,10,1,117,13, 0,0,0,95,114,101,115,111,108,118,101,95,110,97,109,101, 99,2,0,0,0,0,0,0,0,4,0,0,0,11,0,0, @@ -3720,7 +3738,7 @@ unsigned char _Py_M__importlib[] = { 0,0,40,0,0,0,0,117,29,0,0,0,60,102,114,111, 122,101,110,32,105,109,112,111,114,116,108,105,98,46,95,98, 111,111,116,115,116,114,97,112,62,117,12,0,0,0,95,102, - 105,110,100,95,109,111,100,117,108,101,191,5,0,0,115,20, + 105,110,100,95,109,111,100,117,108,101,196,5,0,0,115,20, 0,0,0,0,2,9,1,19,1,16,1,10,1,24,1,12, 2,15,1,4,2,21,2,117,12,0,0,0,95,102,105,110, 100,95,109,111,100,117,108,101,99,3,0,0,0,0,0,0, @@ -3765,7 +3783,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,114, 116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,62, 117,13,0,0,0,95,115,97,110,105,116,121,95,99,104,101, - 99,107,208,5,0,0,115,24,0,0,0,0,2,15,1,30, + 99,107,213,5,0,0,115,24,0,0,0,0,2,15,1,30, 1,12,1,15,1,6,1,15,1,15,1,15,1,6,2,27, 1,19,1,117,13,0,0,0,95,115,97,110,105,116,121,95, 99,104,101,99,107,117,20,0,0,0,78,111,32,109,111,100, @@ -3842,7 +3860,7 @@ unsigned char _Py_M__importlib[] = { 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111, 111,116,115,116,114,97,112,62,117,23,0,0,0,95,102,105, 110,100,95,97,110,100,95,108,111,97,100,95,117,110,108,111, - 99,107,101,100,227,5,0,0,115,76,0,0,0,0,1,6, + 99,107,101,100,232,5,0,0,115,76,0,0,0,0,1,6, 1,19,1,6,1,15,1,16,2,15,1,11,2,13,1,3, 1,13,1,13,1,22,1,26,1,15,1,12,1,27,3,9, 1,9,1,15,2,13,1,19,2,13,1,6,2,13,1,32, @@ -3872,7 +3890,7 @@ unsigned char _Py_M__importlib[] = { 117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112, 111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97, 112,62,117,14,0,0,0,95,102,105,110,100,95,97,110,100, - 95,108,111,97,100,21,6,0,0,115,14,0,0,0,0,2, + 95,108,111,97,100,26,6,0,0,115,14,0,0,0,0,2, 3,1,16,2,11,1,10,1,3,1,17,2,117,14,0,0, 0,95,102,105,110,100,95,97,110,100,95,108,111,97,100,99, 3,0,0,0,0,0,0,0,5,0,0,0,4,0,0,0, @@ -3930,7 +3948,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,40,0,0,0,0,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,11,0,0,0, - 95,103,99,100,95,105,109,112,111,114,116,34,6,0,0,115, + 95,103,99,100,95,105,109,112,111,114,116,39,6,0,0,115, 28,0,0,0,0,9,16,1,12,1,21,1,10,1,15,1, 13,1,13,1,12,1,10,1,6,1,9,1,21,1,10,1, 117,11,0,0,0,95,103,99,100,95,105,109,112,111,114,116, @@ -3989,7 +4007,7 @@ unsigned char _Py_M__importlib[] = { 102,114,111,122,101,110,32,105,109,112,111,114,116,108,105,98, 46,95,98,111,111,116,115,116,114,97,112,62,117,16,0,0, 0,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115, - 116,58,6,0,0,115,34,0,0,0,0,10,15,1,12,1, + 116,63,6,0,0,115,34,0,0,0,0,10,15,1,12,1, 12,1,13,1,15,1,22,1,13,1,15,1,21,1,3,1, 17,1,18,6,18,1,15,1,9,1,32,1,117,16,0,0, 0,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115, @@ -4022,7 +4040,7 @@ unsigned char _Py_M__importlib[] = { 0,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108, 105,98,46,95,98,111,111,116,115,116,114,97,112,62,117,17, 0,0,0,95,99,97,108,99,95,95,95,112,97,99,107,97, - 103,101,95,95,92,6,0,0,115,12,0,0,0,0,7,15, + 103,101,95,95,97,6,0,0,115,12,0,0,0,0,7,15, 1,12,1,10,1,12,1,25,1,117,17,0,0,0,95,99, 97,108,99,95,95,95,112,97,99,107,97,103,101,95,95,99, 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0, @@ -4053,7 +4071,7 @@ unsigned char _Py_M__importlib[] = { 32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 115,116,114,97,112,62,117,27,0,0,0,95,103,101,116,95, 115,117,112,112,111,114,116,101,100,95,102,105,108,101,95,108, - 111,97,100,101,114,115,107,6,0,0,115,8,0,0,0,0, + 111,97,100,101,114,115,112,6,0,0,115,8,0,0,0,0, 5,18,1,12,1,12,1,117,27,0,0,0,95,103,101,116, 95,115,117,112,112,111,114,116,101,100,95,102,105,108,101,95, 108,111,97,100,101,114,115,99,5,0,0,0,0,0,0,0, @@ -4121,7 +4139,7 @@ unsigned char _Py_M__importlib[] = { 0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122, 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111, 111,116,115,116,114,97,112,62,117,10,0,0,0,95,95,105, - 109,112,111,114,116,95,95,118,6,0,0,115,26,0,0,0, + 109,112,111,114,116,95,95,123,6,0,0,115,26,0,0,0, 0,11,12,1,15,2,24,1,12,1,18,1,6,3,12,1, 23,1,6,1,4,4,35,3,40,2,117,10,0,0,0,95, 95,105,109,112,111,114,116,95,95,99,2,0,0,0,0,0, @@ -4208,7 +4226,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,117,29,0,0,0,60,102,114,111,122,101,110,32, 105,109,112,111,114,116,108,105,98,46,95,98,111,111,116,115, 116,114,97,112,62,117,9,0,0,0,60,103,101,110,101,120, - 112,114,62,191,6,0,0,115,2,0,0,0,6,0,117,25, + 112,114,62,196,6,0,0,115,2,0,0,0,6,0,117,25, 0,0,0,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,105,0,0,0, 0,117,7,0,0,0,69,77,88,32,71,67,67,105,1,0, @@ -4279,7 +4297,7 @@ unsigned char _Py_M__importlib[] = { 0,0,0,0,40,0,0,0,0,117,29,0,0,0,60,102, 114,111,122,101,110,32,105,109,112,111,114,116,108,105,98,46, 95,98,111,111,116,115,116,114,97,112,62,117,6,0,0,0, - 95,115,101,116,117,112,154,6,0,0,115,106,0,0,0,0, + 95,115,101,116,117,112,159,6,0,0,115,106,0,0,0,0, 9,6,1,6,2,12,1,9,2,6,2,12,1,28,1,15, 1,15,1,15,1,12,1,15,1,22,2,13,1,13,1,15, 1,18,2,13,1,20,2,48,1,19,2,31,1,10,1,15, @@ -4323,7 +4341,7 @@ unsigned char _Py_M__importlib[] = { 115,40,0,0,0,0,40,0,0,0,0,117,29,0,0,0, 60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,105, 98,46,95,98,111,111,116,115,116,114,97,112,62,117,8,0, - 0,0,95,105,110,115,116,97,108,108,233,6,0,0,115,16, + 0,0,95,105,110,115,116,97,108,108,238,6,0,0,115,16, 0,0,0,0,2,13,1,9,1,28,1,16,1,16,1,15, 1,19,1,117,8,0,0,0,95,105,110,115,116,97,108,108, 78,40,3,0,0,0,117,3,0,0,0,119,105,110,117,6, @@ -4424,7 +4442,7 @@ unsigned char _Py_M__importlib[] = { 12,19,12,20,12,100,34,1,37,2,6,2,9,2,9,1, 9,2,15,27,12,23,12,19,18,8,12,13,12,11,12,55, 12,18,12,11,12,11,12,17,19,57,19,54,19,50,19,83, - 22,134,19,29,25,49,25,25,6,3,19,45,19,55,19,18, + 22,134,19,29,25,49,25,25,6,3,19,50,19,55,19,18, 19,91,19,128,19,13,12,9,12,17,12,17,6,2,12,50, 12,13,18,24,12,34,12,15,12,11,24,36,12,79, }; -- cgit v0.12