mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-11 12:29:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #15316: Let exceptions raised during imports triggered by the

Browse source 
fromlist of __import__ propagate.

The problem previously was that if something listed in fromlist didn't
exist then that's okay. The fix for that was too broad in terms of
catching ImportError.

The trick with the solution to this issue is that the proper
refactoring of import thanks to importlib doesn't allow for a way to
distinguish (portably) between an ImportError because finders couldn't
find a loader, or a loader raised the exception. In Python 3.4 the
hope is to introduce a new exception (e.g. ModuleNotFound) to make it
clean to differentiate why ImportError was raised.
This commit is contained in:
Brett Cannon 2012-08-24 18:25:59 -04:00
parent 7a54d16dc5
commit 12c6bda4f0
4 changed files with 254 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/importlib/_bootstrap.py
View file

@ -1513,7 +1513,11 @@ def _find_and_load_unlocked(name, import_):
raise ImportError(msg, name=name) raise ImportError(msg, name=name)
loader = _find_module(name, path) loader = _find_module(name, path)
if loader is None: if loader is None:
raise ImportError(_ERR_MSG.format(name), name=name) exc = ImportError(_ERR_MSG.format(name), name=name)
# TODO(brett): switch to a proper ModuleNotFound exception in Python
# 3.4.
exc._not_found = True
raise exc
elif name not in sys.modules: elif name not in sys.modules:
# The parent import may have already imported this module. # The parent import may have already imported this module.
loader.load_module(name) loader.load_module(name)
@ -1599,10 +1603,16 @@ def _handle_fromlist(module, fromlist, import_):
try: try:
_call_with_frames_removed(import_, _call_with_frames_removed(import_,
'{}.{}'.format(module.__name__, x)) '{}.{}'.format(module.__name__, x))
except ImportError: except ImportError as exc:
# Backwards-compatibility dictates we ignore failed # Backwards-compatibility dictates we ignore failed
# imports triggered by fromlist. # imports triggered by fromlist for modules that don't
# exist.
# TODO(brett): In Python 3.4, have import raise
# ModuleNotFound and catch that.
if hasattr(exc, '_not_found') and exc._not_found:
pass pass
else:
raise
return module return module

38
Lib/test/test_importlib/import_/test_api.py
View file

@ -1,7 +1,22 @@
from .. import util as importlib_test_util
from . import util from . import util
import imp
import sys
import unittest import unittest
class BadLoaderFinder:
bad = 'fine.bogus'
@classmethod
def find_module(cls, fullname, path):
if fullname == cls.bad:
return cls
@classmethod
def load_module(cls, fullname):
if fullname == cls.bad:
raise ImportError('I cannot be loaded!')
class APITest(unittest.TestCase): class APITest(unittest.TestCase):
"""Test API-specific details for __import__ (e.g. raising the right """Test API-specific details for __import__ (e.g. raising the right
@ -19,6 +34,29 @@ class APITest(unittest.TestCase):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
util.import_('os', globals(), level=-1) util.import_('os', globals(), level=-1)
def test_nonexistent_fromlist_entry(self):
# If something in fromlist doesn't exist, that's okay.
# issue15715
mod = imp.new_module('fine')
mod.__path__ = ['XXX']
with importlib_test_util.import_state(meta_path=[BadLoaderFinder]):
with importlib_test_util.uncache('fine'):
sys.modules['fine'] = mod
util.import_('fine', fromlist=['not here'])
def test_fromlist_load_error_propagates(self):
# If something in fromlist triggers an exception not related to not
# existing, let that exception propagate.
# issue15316
mod = imp.new_module('fine')
mod.__path__ = ['XXX']
with importlib_test_util.import_state(meta_path=[BadLoaderFinder]):
with importlib_test_util.uncache('fine'):
sys.modules['fine'] = mod
with self.assertRaises(ImportError):
util.import_('fine', fromlist=['bogus'])
def test_main(): def test_main():
from test.support import run_unittest from test.support import run_unittest

4
Misc/NEWS
View file

@ -10,6 +10,10 @@ What's New in Python 3.3.0 Release Candidate 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #15316: When an item in the fromlist for __import__ doesn't exist,
don't raise an error, but if an exception is raised as part of an import do
let that propagate.
- Issue #15778: ensure that str(ImportError(msg)) returns a str - Issue #15778: ensure that str(ImportError(msg)) returns a str
even when msg isn't a str. even when msg isn't a str.

387
Python/importlib.h
View file

@ -3745,8 +3745,8 @@ unsigned char _Py_M__importlib[] = {
1,15,1,6,2,27,1,19,1,117,13,0,0,0,95,115, 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, 97,110,105,116,121,95,99,104,101,99,107,117,20,0,0,0,
78,111,32,109,111,100,117,108,101,32,110,97,109,101,100,32, 78,111,32,109,111,100,117,108,101,32,110,97,109,101,100,32,
123,33,114,125,99,2,0,0,0,0,0,0,0,8,0,0, 123,33,114,125,99,2,0,0,0,0,0,0,0,9,0,0,
0,27,0,0,0,67,0,0,0,115,253,1,0,0,100,0, 0,27,0,0,0,67,0,0,0,115,12,2,0,0,100,0,
0,125,2,0,124,0,0,106,1,0,100,1,0,131,1,0, 0,125,2,0,124,0,0,106,1,0,100,1,0,131,1,0,
100,2,0,25,125,3,0,124,3,0,114,178,0,124,3,0, 100,2,0,25,125,3,0,124,3,0,114,178,0,124,3,0,
116,2,0,106,3,0,107,7,0,114,62,0,116,4,0,124, 116,2,0,106,3,0,107,7,0,114,62,0,116,4,0,124,
@ -3759,34 +3759,35 @@ unsigned char _Py_M__importlib[] = {
131,2,0,125,5,0,116,9,0,124,5,0,100,4,0,124, 131,2,0,125,5,0,116,9,0,124,5,0,100,4,0,124,
0,0,131,1,1,130,1,0,89,113,178,0,88,110,0,0, 0,0,131,1,1,130,1,0,89,113,178,0,88,110,0,0,
116,10,0,124,0,0,124,2,0,131,2,0,125,6,0,124, 116,10,0,124,0,0,124,2,0,131,2,0,125,6,0,124,
6,0,100,0,0,107,8,0,114,235,0,116,9,0,116,7, 6,0,100,0,0,107,8,0,114,250,0,116,9,0,116,7,
0,106,8,0,124,0,0,131,1,0,100,4,0,124,0,0, 0,106,8,0,124,0,0,131,1,0,100,4,0,124,0,0,
131,1,1,130,1,0,110,47,0,124,0,0,116,2,0,106, 131,1,1,125,7,0,100,10,0,124,7,0,95,12,0,124,
3,0,107,7,0,114,26,1,124,6,0,106,11,0,124,0, 7,0,130,1,0,110,47,0,124,0,0,116,2,0,106,3,
0,131,1,0,1,116,12,0,100,5,0,124,0,0,124,6, 0,107,7,0,114,41,1,124,6,0,106,13,0,124,0,0,
0,131,3,0,1,110,0,0,116,2,0,106,3,0,124,0, 131,1,0,1,116,14,0,100,5,0,124,0,0,124,6,0,
0,25,125,7,0,124,3,0,114,90,1,116,2,0,106,3, 131,3,0,1,110,0,0,116,2,0,106,3,0,124,0,0,
0,124,3,0,25,125,4,0,116,13,0,124,4,0,124,0, 25,125,8,0,124,3,0,114,105,1,116,2,0,106,3,0,
0,106,1,0,100,1,0,131,1,0,100,6,0,25,124,7, 124,3,0,25,125,4,0,116,15,0,124,4,0,124,0,0,
0,131,3,0,1,110,0,0,116,14,0,124,7,0,100,7, 106,1,0,100,1,0,131,1,0,100,6,0,25,124,8,0,
0,100,0,0,131,3,0,100,0,0,107,8,0,114,197,1, 131,3,0,1,110,0,0,116,16,0,124,8,0,100,7,0,
121,59,0,124,7,0,106,15,0,124,7,0,95,16,0,116, 100,0,0,131,3,0,100,0,0,107,8,0,114,212,1,121,
17,0,124,7,0,100,8,0,131,2,0,115,172,1,124,7, 59,0,124,8,0,106,17,0,124,8,0,95,18,0,116,19,
0,106,16,0,106,1,0,100,1,0,131,1,0,100,2,0, 0,124,8,0,100,8,0,131,2,0,115,187,1,124,8,0,
25,124,7,0,95,16,0,110,0,0,87,113,197,1,4,116, 106,18,0,106,1,0,100,1,0,131,1,0,100,2,0,25,
6,0,107,10,0,114,193,1,1,1,1,89,113,197,1,88, 124,8,0,95,18,0,110,0,0,87,113,212,1,4,116,6,
110,0,0,116,17,0,124,7,0,100,9,0,131,2,0,115, 0,107,10,0,114,208,1,1,1,1,89,113,212,1,88,110,
249,1,121,13,0,124,6,0,124,7,0,95,18,0,87,113, 0,0,116,19,0,124,8,0,100,9,0,131,2,0,115,8,
249,1,4,116,6,0,107,10,0,114,245,1,1,1,1,89, 2,121,13,0,124,6,0,124,8,0,95,20,0,87,113,8,
113,249,1,88,110,0,0,124,7,0,83,40,10,0,0,0, 2,4,116,6,0,107,10,0,114,4,2,1,1,1,89,113,
78,117,1,0,0,0,46,105,0,0,0,0,117,21,0,0, 8,2,88,110,0,0,124,8,0,83,40,11,0,0,0,78,
0,59,32,123,125,32,105,115,32,110,111,116,32,97,32,112, 117,1,0,0,0,46,105,0,0,0,0,117,21,0,0,0,
97,99,107,97,103,101,117,4,0,0,0,110,97,109,101,117, 59,32,123,125,32,105,115,32,110,111,116,32,97,32,112,97,
18,0,0,0,105,109,112,111,114,116,32,123,33,114,125,32, 99,107,97,103,101,117,4,0,0,0,110,97,109,101,117,18,
35,32,123,33,114,125,105,2,0,0,0,117,11,0,0,0, 0,0,0,105,109,112,111,114,116,32,123,33,114,125,32,35,
95,95,112,97,99,107,97,103,101,95,95,117,8,0,0,0, 32,123,33,114,125,105,2,0,0,0,117,11,0,0,0,95,
95,95,112,97,116,104,95,95,117,10,0,0,0,95,95,108, 95,112,97,99,107,97,103,101,95,95,117,8,0,0,0,95,
111,97,100,101,114,95,95,40,19,0,0,0,117,4,0,0, 95,112,97,116,104,95,95,117,10,0,0,0,95,95,108,111,
97,100,101,114,95,95,84,40,21,0,0,0,117,4,0,0,
0,78,111,110,101,117,10,0,0,0,114,112,97,114,116,105, 0,78,111,110,101,117,10,0,0,0,114,112,97,114,116,105,
116,105,111,110,117,3,0,0,0,115,121,115,117,7,0,0, 116,105,111,110,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, 0,109,111,100,117,108,101,115,117,25,0,0,0,95,99,97,
@ -3797,164 +3798,172 @@ unsigned char _Py_M__importlib[] = {
77,83,71,117,6,0,0,0,102,111,114,109,97,116,117,11, 77,83,71,117,6,0,0,0,102,111,114,109,97,116,117,11,
0,0,0,73,109,112,111,114,116,69,114,114,111,114,117,12, 0,0,0,73,109,112,111,114,116,69,114,114,111,114,117,12,
0,0,0,95,102,105,110,100,95,109,111,100,117,108,101,117, 0,0,0,95,102,105,110,100,95,109,111,100,117,108,101,117,
11,0,0,0,108,111,97,100,95,109,111,100,117,108,101,117, 4,0,0,0,84,114,117,101,117,10,0,0,0,95,110,111,
16,0,0,0,95,118,101,114,98,111,115,101,95,109,101,115, 116,95,102,111,117,110,100,117,11,0,0,0,108,111,97,100,
115,97,103,101,117,7,0,0,0,115,101,116,97,116,116,114, 95,109,111,100,117,108,101,117,16,0,0,0,95,118,101,114,
117,7,0,0,0,103,101,116,97,116,116,114,117,8,0,0, 98,111,115,101,95,109,101,115,115,97,103,101,117,7,0,0,
0,95,95,110,97,109,101,95,95,117,11,0,0,0,95,95, 0,115,101,116,97,116,116,114,117,7,0,0,0,103,101,116,
112,97,99,107,97,103,101,95,95,117,7,0,0,0,104,97, 97,116,116,114,117,8,0,0,0,95,95,110,97,109,101,95,
115,97,116,116,114,117,10,0,0,0,95,95,108,111,97,100, 95,117,11,0,0,0,95,95,112,97,99,107,97,103,101,95,
101,114,95,95,40,8,0,0,0,117,4,0,0,0,110,97, 95,117,7,0,0,0,104,97,115,97,116,116,114,117,10,0,
109,101,117,7,0,0,0,105,109,112,111,114,116,95,117,4, 0,0,95,95,108,111,97,100,101,114,95,95,40,9,0,0,
0,0,0,112,97,116,104,117,6,0,0,0,112,97,114,101, 0,117,4,0,0,0,110,97,109,101,117,7,0,0,0,105,
110,116,117,13,0,0,0,112,97,114,101,110,116,95,109,111, 109,112,111,114,116,95,117,4,0,0,0,112,97,116,104,117,
100,117,108,101,117,3,0,0,0,109,115,103,117,6,0,0, 6,0,0,0,112,97,114,101,110,116,117,13,0,0,0,112,
0,108,111,97,100,101,114,117,6,0,0,0,109,111,100,117, 97,114,101,110,116,95,109,111,100,117,108,101,117,3,0,0,
0,109,115,103,117,6,0,0,0,108,111,97,100,101,114,117,
3,0,0,0,101,120,99,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, 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, 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, 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, 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,218,5,0,0,115,72, 100,95,117,110,108,111,99,107,101,100,218,5,0,0,115,76,
0,0,0,0,1,6,1,19,1,6,1,15,1,16,2,15, 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,11,2,13,1,3,1,13,1,13,1,22,1,26,1,15,
1,12,1,30,1,15,2,13,1,19,2,13,1,6,2,13, 1,12,1,27,3,9,1,9,1,15,2,13,1,19,2,13,
1,32,2,24,1,3,1,12,1,15,1,32,1,13,1,8, 1,6,2,13,1,32,2,24,1,3,1,12,1,15,1,32,
2,15,1,3,1,13,1,13,1,8,1,117,23,0,0,0, 1,13,1,8,2,15,1,3,1,13,1,13,1,8,1,117,
95,102,105,110,100,95,97,110,100,95,108,111,97,100,95,117, 23,0,0,0,95,102,105,110,100,95,97,110,100,95,108,111,
110,108,111,99,107,101,100,99,2,0,0,0,0,0,0,0, 97,100,95,117,110,108,111,99,107,101,100,99,2,0,0,0,
3,0,0,0,18,0,0,0,67,0,0,0,115,75,0,0, 0,0,0,0,3,0,0,0,18,0,0,0,67,0,0,0,
0,122,16,0,116,0,0,124,0,0,131,1,0,125,2,0, 115,75,0,0,0,122,16,0,116,0,0,124,0,0,131,1,
87,100,1,0,116,1,0,106,2,0,131,0,0,1,88,124, 0,125,2,0,87,100,1,0,116,1,0,106,2,0,131,0,
2,0,106,3,0,131,0,0,1,122,17,0,116,4,0,124, 0,1,88,124,2,0,106,3,0,131,0,0,1,122,17,0,
0,0,124,1,0,131,2,0,83,87,100,1,0,124,2,0, 116,4,0,124,0,0,124,1,0,131,2,0,83,87,100,1,
106,5,0,131,0,0,1,88,100,1,0,83,40,2,0,0, 0,124,2,0,106,5,0,131,0,0,1,88,100,1,0,83,
0,117,54,0,0,0,70,105,110,100,32,97,110,100,32,108, 40,2,0,0,0,117,54,0,0,0,70,105,110,100,32,97,
111,97,100,32,116,104,101,32,109,111,100,117,108,101,44,32, 110,100,32,108,111,97,100,32,116,104,101,32,109,111,100,117,
97,110,100,32,114,101,108,101,97,115,101,32,116,104,101,32, 108,101,44,32,97,110,100,32,114,101,108,101,97,115,101,32,
105,109,112,111,114,116,32,108,111,99,107,46,78,40,6,0, 116,104,101,32,105,109,112,111,114,116,32,108,111,99,107,46,
0,0,117,16,0,0,0,95,103,101,116,95,109,111,100,117, 78,40,6,0,0,0,117,16,0,0,0,95,103,101,116,95,
108,101,95,108,111,99,107,117,4,0,0,0,95,105,109,112, 109,111,100,117,108,101,95,108,111,99,107,117,4,0,0,0,
117,12,0,0,0,114,101,108,101,97,115,101,95,108,111,99, 95,105,109,112,117,12,0,0,0,114,101,108,101,97,115,101,
107,117,7,0,0,0,97,99,113,117,105,114,101,117,23,0, 95,108,111,99,107,117,7,0,0,0,97,99,113,117,105,114,
0,0,95,102,105,110,100,95,97,110,100,95,108,111,97,100, 101,117,23,0,0,0,95,102,105,110,100,95,97,110,100,95,
95,117,110,108,111,99,107,101,100,117,7,0,0,0,114,101, 108,111,97,100,95,117,110,108,111,99,107,101,100,117,7,0,
108,101,97,115,101,40,3,0,0,0,117,4,0,0,0,110, 0,0,114,101,108,101,97,115,101,40,3,0,0,0,117,4,
97,109,101,117,7,0,0,0,105,109,112,111,114,116,95,117, 0,0,0,110,97,109,101,117,7,0,0,0,105,109,112,111,
4,0,0,0,108,111,99,107,40,0,0,0,0,40,0,0, 114,116,95,117,4,0,0,0,108,111,99,107,40,0,0,0,
0,0,117,29,0,0,0,60,102,114,111,122,101,110,32,105, 0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122,
109,112,111,114,116,108,105,98,46,95,98,111,111,116,115,116, 101,110,32,105,109,112,111,114,116,108,105,98,46,95,98,111,
114,97,112,62,117,14,0,0,0,95,102,105,110,100,95,97, 111,116,115,116,114,97,112,62,117,14,0,0,0,95,102,105,
110,100,95,108,111,97,100,8,6,0,0,115,14,0,0,0, 110,100,95,97,110,100,95,108,111,97,100,12,6,0,0,115,
0,2,3,1,16,2,11,1,10,1,3,1,17,2,117,14, 14,0,0,0,0,2,3,1,16,2,11,1,10,1,3,1,
0,0,0,95,102,105,110,100,95,97,110,100,95,108,111,97, 17,2,117,14,0,0,0,95,102,105,110,100,95,97,110,100,
100,99,3,0,0,0,0,0,0,0,5,0,0,0,4,0, 95,108,111,97,100,99,3,0,0,0,0,0,0,0,5,0,
0,0,67,0,0,0,115,172,0,0,0,116,0,0,124,0, 0,0,4,0,0,0,67,0,0,0,115,172,0,0,0,116,
0,124,1,0,124,2,0,131,3,0,1,124,2,0,100,1, 0,0,124,0,0,124,1,0,124,2,0,131,3,0,1,124,
0,107,4,0,114,49,0,116,1,0,124,0,0,124,1,0, 2,0,100,1,0,107,4,0,114,49,0,116,1,0,124,0,
124,2,0,131,3,0,125,0,0,110,0,0,116,2,0,106, 0,124,1,0,124,2,0,131,3,0,125,0,0,110,0,0,
3,0,131,0,0,1,124,0,0,116,4,0,106,5,0,107, 116,2,0,106,3,0,131,0,0,1,124,0,0,116,4,0,
7,0,114,87,0,116,6,0,124,0,0,116,7,0,131,2, 106,5,0,107,7,0,114,87,0,116,6,0,124,0,0,116,
0,83,116,4,0,106,5,0,124,0,0,25,125,3,0,124, 7,0,131,2,0,83,116,4,0,106,5,0,124,0,0,25,
3,0,100,4,0,107,8,0,114,158,0,116,2,0,106,9, 125,3,0,124,3,0,100,4,0,107,8,0,114,158,0,116,
0,131,0,0,1,100,2,0,106,10,0,124,0,0,131,1, 2,0,106,9,0,131,0,0,1,100,2,0,106,10,0,124,
0,125,4,0,116,11,0,124,4,0,100,3,0,124,0,0, 0,0,131,1,0,125,4,0,116,11,0,124,4,0,100,3,
131,1,1,130,1,0,110,0,0,116,12,0,124,0,0,131, 0,124,0,0,131,1,1,130,1,0,110,0,0,116,12,0,
1,0,1,124,3,0,83,40,5,0,0,0,117,50,1,0, 124,0,0,131,1,0,1,124,3,0,83,40,5,0,0,0,
0,73,109,112,111,114,116,32,97,110,100,32,114,101,116,117, 117,50,1,0,0,73,109,112,111,114,116,32,97,110,100,32,
114,110,32,116,104,101,32,109,111,100,117,108,101,32,98,97, 114,101,116,117,114,110,32,116,104,101,32,109,111,100,117,108,
115,101,100,32,111,110,32,105,116,115,32,110,97,109,101,44, 101,32,98,97,115,101,100,32,111,110,32,105,116,115,32,110,
32,116,104,101,32,112,97,99,107,97,103,101,32,116,104,101, 97,109,101,44,32,116,104,101,32,112,97,99,107,97,103,101,
32,99,97,108,108,32,105,115,10,32,32,32,32,98,101,105, 32,116,104,101,32,99,97,108,108,32,105,115,10,32,32,32,
110,103,32,109,97,100,101,32,102,114,111,109,44,32,97,110, 32,98,101,105,110,103,32,109,97,100,101,32,102,114,111,109,
100,32,116,104,101,32,108,101,118,101,108,32,97,100,106,117, 44,32,97,110,100,32,116,104,101,32,108,101,118,101,108,32,
115,116,109,101,110,116,46,10,10,32,32,32,32,84,104,105, 97,100,106,117,115,116,109,101,110,116,46,10,10,32,32,32,
115,32,102,117,110,99,116,105,111,110,32,114,101,112,114,101, 32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,114,
115,101,110,116,115,32,116,104,101,32,103,114,101,97,116,101, 101,112,114,101,115,101,110,116,115,32,116,104,101,32,103,114,
115,116,32,99,111,109,109,111,110,32,100,101,110,111,109,105, 101,97,116,101,115,116,32,99,111,109,109,111,110,32,100,101,
110,97,116,111,114,32,111,102,32,102,117,110,99,116,105,111, 110,111,109,105,110,97,116,111,114,32,111,102,32,102,117,110,
110,97,108,105,116,121,10,32,32,32,32,98,101,116,119,101, 99,116,105,111,110,97,108,105,116,121,10,32,32,32,32,98,
101,110,32,105,109,112,111,114,116,95,109,111,100,117,108,101, 101,116,119,101,101,110,32,105,109,112,111,114,116,95,109,111,
32,97,110,100,32,95,95,105,109,112,111,114,116,95,95,46, 100,117,108,101,32,97,110,100,32,95,95,105,109,112,111,114,
32,84,104,105,115,32,105,110,99,108,117,100,101,115,32,115, 116,95,95,46,32,84,104,105,115,32,105,110,99,108,117,100,
101,116,116,105,110,103,32,95,95,112,97,99,107,97,103,101, 101,115,32,115,101,116,116,105,110,103,32,95,95,112,97,99,
95,95,32,105,102,10,32,32,32,32,116,104,101,32,108,111, 107,97,103,101,95,95,32,105,102,10,32,32,32,32,116,104,
97,100,101,114,32,100,105,100,32,110,111,116,46,10,10,32, 101,32,108,111,97,100,101,114,32,100,105,100,32,110,111,116,
32,32,32,105,0,0,0,0,117,40,0,0,0,105,109,112, 46,10,10,32,32,32,32,105,0,0,0,0,117,40,0,0,
111,114,116,32,111,102,32,123,125,32,104,97,108,116,101,100, 0,105,109,112,111,114,116,32,111,102,32,123,125,32,104,97,
59,32,78,111,110,101,32,105,110,32,115,121,115,46,109,111, 108,116,101,100,59,32,78,111,110,101,32,105,110,32,115,121,
100,117,108,101,115,117,4,0,0,0,110,97,109,101,78,40, 115,46,109,111,100,117,108,101,115,117,4,0,0,0,110,97,
13,0,0,0,117,13,0,0,0,95,115,97,110,105,116,121, 109,101,78,40,13,0,0,0,117,13,0,0,0,95,115,97,
95,99,104,101,99,107,117,13,0,0,0,95,114,101,115,111, 110,105,116,121,95,99,104,101,99,107,117,13,0,0,0,95,
108,118,101,95,110,97,109,101,117,4,0,0,0,95,105,109, 114,101,115,111,108,118,101,95,110,97,109,101,117,4,0,0,
112,117,12,0,0,0,97,99,113,117,105,114,101,95,108,111, 0,95,105,109,112,117,12,0,0,0,97,99,113,117,105,114,
99,107,117,3,0,0,0,115,121,115,117,7,0,0,0,109, 101,95,108,111,99,107,117,3,0,0,0,115,121,115,117,7,
111,100,117,108,101,115,117,14,0,0,0,95,102,105,110,100, 0,0,0,109,111,100,117,108,101,115,117,14,0,0,0,95,
95,97,110,100,95,108,111,97,100,117,11,0,0,0,95,103, 102,105,110,100,95,97,110,100,95,108,111,97,100,117,11,0,
99,100,95,105,109,112,111,114,116,117,4,0,0,0,78,111, 0,0,95,103,99,100,95,105,109,112,111,114,116,117,4,0,
110,101,117,12,0,0,0,114,101,108,101,97,115,101,95,108, 0,0,78,111,110,101,117,12,0,0,0,114,101,108,101,97,
111,99,107,117,6,0,0,0,102,111,114,109,97,116,117,11, 115,101,95,108,111,99,107,117,6,0,0,0,102,111,114,109,
0,0,0,73,109,112,111,114,116,69,114,114,111,114,117,19, 97,116,117,11,0,0,0,73,109,112,111,114,116,69,114,114,
0,0,0,95,108,111,99,107,95,117,110,108,111,99,107,95, 111,114,117,19,0,0,0,95,108,111,99,107,95,117,110,108,
109,111,100,117,108,101,40,5,0,0,0,117,4,0,0,0, 111,99,107,95,109,111,100,117,108,101,40,5,0,0,0,117,
110,97,109,101,117,7,0,0,0,112,97,99,107,97,103,101, 4,0,0,0,110,97,109,101,117,7,0,0,0,112,97,99,
117,5,0,0,0,108,101,118,101,108,117,6,0,0,0,109, 107,97,103,101,117,5,0,0,0,108,101,118,101,108,117,6,
111,100,117,108,101,117,7,0,0,0,109,101,115,115,97,103, 0,0,0,109,111,100,117,108,101,117,7,0,0,0,109,101,
101,40,0,0,0,0,40,0,0,0,0,117,29,0,0,0, 115,115,97,103,101,40,0,0,0,0,40,0,0,0,0,117,
60,102,114,111,122,101,110,32,105,109,112,111,114,116,108,105, 29,0,0,0,60,102,114,111,122,101,110,32,105,109,112,111,
98,46,95,98,111,111,116,115,116,114,97,112,62,117,11,0, 114,116,108,105,98,46,95,98,111,111,116,115,116,114,97,112,
0,0,95,103,99,100,95,105,109,112,111,114,116,21,6,0, 62,117,11,0,0,0,95,103,99,100,95,105,109,112,111,114,
0,115,28,0,0,0,0,9,16,1,12,1,21,1,10,1, 116,25,6,0,0,115,28,0,0,0,0,9,16,1,12,1,
15,1,13,1,13,1,12,1,10,1,6,1,9,1,21,1, 21,1,10,1,15,1,13,1,13,1,12,1,10,1,6,1,
10,1,117,11,0,0,0,95,103,99,100,95,105,109,112,111, 9,1,21,1,10,1,117,11,0,0,0,95,103,99,100,95,
114,116,99,3,0,0,0,0,0,0,0,4,0,0,0,12, 105,109,112,111,114,116,99,3,0,0,0,0,0,0,0,5,
0,0,0,67,0,0,0,115,184,0,0,0,116,0,0,124, 0,0,0,17,0,0,0,67,0,0,0,115,233,0,0,0,
0,0,100,1,0,131,2,0,114,180,0,100,2,0,124,1, 116,0,0,124,0,0,100,1,0,131,2,0,114,229,0,100,
0,107,6,0,114,89,0,116,1,0,124,1,0,131,1,0, 2,0,124,1,0,107,6,0,114,89,0,116,1,0,124,1,
125,1,0,124,1,0,106,2,0,100,2,0,131,1,0,1, 0,131,1,0,125,1,0,124,1,0,106,2,0,100,2,0,
116,0,0,124,0,0,100,3,0,131,2,0,114,89,0,124, 131,1,0,1,116,0,0,124,0,0,100,3,0,131,2,0,
1,0,106,3,0,124,0,0,106,4,0,131,1,0,1,113, 114,89,0,124,1,0,106,3,0,124,0,0,106,4,0,131,
89,0,110,0,0,120,88,0,124,1,0,68,93,77,0,125, 1,0,1,113,89,0,110,0,0,120,137,0,124,1,0,68,
3,0,116,0,0,124,0,0,124,3,0,131,2,0,115,96, 93,126,0,125,3,0,116,0,0,124,0,0,124,3,0,131,
0,121,32,0,116,5,0,124,2,0,100,4,0,106,6,0, 2,0,115,96,0,121,32,0,116,5,0,124,2,0,100,4,
124,0,0,106,7,0,124,3,0,131,2,0,131,2,0,1, 0,106,6,0,124,0,0,106,7,0,124,3,0,131,2,0,
87,113,173,0,4,116,8,0,107,10,0,114,169,0,1,1, 131,2,0,1,87,113,222,0,4,116,8,0,107,10,0,114,
1,89,113,173,0,88,113,96,0,113,96,0,87,110,0,0, 218,0,1,125,4,0,1,122,35,0,116,0,0,124,4,0,
124,0,0,83,40,5,0,0,0,117,238,0,0,0,70,105, 100,5,0,131,2,0,114,197,0,124,4,0,106,9,0,114,
103,117,114,101,32,111,117,116,32,119,104,97,116,32,95,95, 197,0,110,3,0,130,0,0,87,89,100,6,0,100,6,0,
105,109,112,111,114,116,95,95,32,115,104,111,117,108,100,32, 125,4,0,126,4,0,88,113,222,0,88,113,96,0,113,96,
114,101,116,117,114,110,46,10,10,32,32,32,32,84,104,101, 0,87,110,0,0,124,0,0,83,40,7,0,0,0,117,238,
32,105,109,112,111,114,116,95,32,112,97,114,97,109,101,116, 0,0,0,70,105,103,117,114,101,32,111,117,116,32,119,104,
101,114,32,105,115,32,97,32,99,97,108,108,97,98,108,101, 97,116,32,95,95,105,109,112,111,114,116,95,95,32,115,104,
32,119,104,105,99,104,32,116,97,107,101,115,32,116,104,101, 111,117,108,100,32,114,101,116,117,114,110,46,10,10,32,32,
32,110,97,109,101,32,111,102,32,109,111,100,117,108,101,32, 32,32,84,104,101,32,105,109,112,111,114,116,95,32,112,97,
116,111,10,32,32,32,32,105,109,112,111,114,116,46,32,73, 114,97,109,101,116,101,114,32,105,115,32,97,32,99,97,108,
116,32,105,115,32,114,101,113,117,105,114,101,100,32,116,111, 108,97,98,108,101,32,119,104,105,99,104,32,116,97,107,101,
32,100,101,99,111,117,112,108,101,32,116,104,101,32,102,117, 115,32,116,104,101,32,110,97,109,101,32,111,102,32,109,111,
110,99,116,105,111,110,32,102,114,111,109,32,97,115,115,117, 100,117,108,101,32,116,111,10,32,32,32,32,105,109,112,111,
109,105,110,103,32,105,109,112,111,114,116,108,105,98,39,115, 114,116,46,32,73,116,32,105,115,32,114,101,113,117,105,114,
10,32,32,32,32,105,109,112,111,114,116,32,105,109,112,108, 101,100,32,116,111,32,100,101,99,111,117,112,108,101,32,116,
101,109,101,110,116,97,116,105,111,110,32,105,115,32,100,101, 104,101,32,102,117,110,99,116,105,111,110,32,102,114,111,109,
115,105,114,101,100,46,10,10,32,32,32,32,117,8,0,0, 32,97,115,115,117,109,105,110,103,32,105,109,112,111,114,116,
0,95,95,112,97,116,104,95,95,117,1,0,0,0,42,117, 108,105,98,39,115,10,32,32,32,32,105,109,112,111,114,116,
7,0,0,0,95,95,97,108,108,95,95,117,5,0,0,0, 32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,32,
123,125,46,123,125,40,9,0,0,0,117,7,0,0,0,104, 105,115,32,100,101,115,105,114,101,100,46,10,10,32,32,32,
97,115,97,116,116,114,117,4,0,0,0,108,105,115,116,117, 32,117,8,0,0,0,95,95,112,97,116,104,95,95,117,1,
6,0,0,0,114,101,109,111,118,101,117,6,0,0,0,101, 0,0,0,42,117,7,0,0,0,95,95,97,108,108,95,95,
120,116,101,110,100,117,7,0,0,0,95,95,97,108,108,95, 117,5,0,0,0,123,125,46,123,125,117,10,0,0,0,95,
95,117,25,0,0,0,95,99,97,108,108,95,119,105,116,104, 110,111,116,95,102,111,117,110,100,78,40,10,0,0,0,117,
95,102,114,97,109,101,115,95,114,101,109,111,118,101,100,117, 7,0,0,0,104,97,115,97,116,116,114,117,4,0,0,0,
6,0,0,0,102,111,114,109,97,116,117,8,0,0,0,95, 108,105,115,116,117,6,0,0,0,114,101,109,111,118,101,117,
95,110,97,109,101,95,95,117,11,0,0,0,73,109,112,111, 6,0,0,0,101,120,116,101,110,100,117,7,0,0,0,95,
114,116,69,114,114,111,114,40,4,0,0,0,117,6,0,0, 95,97,108,108,95,95,117,25,0,0,0,95,99,97,108,108,
0,109,111,100,117,108,101,117,8,0,0,0,102,114,111,109, 95,119,105,116,104,95,102,114,97,109,101,115,95,114,101,109,
108,105,115,116,117,7,0,0,0,105,109,112,111,114,116,95, 111,118,101,100,117,6,0,0,0,102,111,114,109,97,116,117,
117,1,0,0,0,120,40,0,0,0,0,40,0,0,0,0, 8,0,0,0,95,95,110,97,109,101,95,95,117,11,0,0,
117,29,0,0,0,60,102,114,111,122,101,110,32,105,109,112, 0,73,109,112,111,114,116,69,114,114,111,114,117,10,0,0,
111,114,116,108,105,98,46,95,98,111,111,116,115,116,114,97, 0,95,110,111,116,95,102,111,117,110,100,40,5,0,0,0,
112,62,117,16,0,0,0,95,104,97,110,100,108,101,95,102, 117,6,0,0,0,109,111,100,117,108,101,117,8,0,0,0,
114,111,109,108,105,115,116,45,6,0,0,115,28,0,0,0, 102,114,111,109,108,105,115,116,117,7,0,0,0,105,109,112,
0,10,15,1,12,1,12,1,13,1,15,1,22,1,13,1, 111,114,116,95,117,1,0,0,0,120,117,3,0,0,0,101,
15,1,3,1,6,1,26,1,13,3,15,1,117,16,0,0, 120,99,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,16,
0,0,0,95,104,97,110,100,108,101,95,102,114,111,109,108,
105,115,116,49,6,0,0,115,32,0,0,0,0,10,15,1,
12,1,12,1,13,1,15,1,22,1,13,1,15,1,3,1,
6,1,26,1,18,6,24,1,3,2,32,1,117,16,0,0,
0,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115, 0,95,104,97,110,100,108,101,95,102,114,111,109,108,105,115,
116,99,1,0,0,0,0,0,0,0,2,0,0,0,2,0, 116,99,1,0,0,0,0,0,0,0,2,0,0,0,2,0,
0,0,67,0,0,0,115,78,0,0,0,124,0,0,106,0, 0,0,67,0,0,0,115,78,0,0,0,124,0,0,106,0,
@ -3985,7 +3994,7 @@ unsigned char _Py_M__importlib[] = {
0,60,102,114,111,122,101,110,32,105,109,112,111,114,116,108, 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, 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, 0,0,0,95,99,97,108,99,95,95,95,112,97,99,107,97,
103,101,95,95,73,6,0,0,115,12,0,0,0,0,7,15, 103,101,95,95,83,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, 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, 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, 0,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,
@ -4017,7 +4026,7 @@ unsigned char _Py_M__importlib[] = {
32,105,109,112,111,114,116,108,105,98,46,95,98,111,111,116, 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,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, 115,117,112,112,111,114,116,101,100,95,102,105,108,101,95,108,
111,97,100,101,114,115,88,6,0,0,115,8,0,0,0,0, 111,97,100,101,114,115,98,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, 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, 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, 108,111,97,100,101,114,115,99,5,0,0,0,0,0,0,0,
@ -4085,7 +4094,7 @@ unsigned char _Py_M__importlib[] = {
0,40,0,0,0,0,117,29,0,0,0,60,102,114,111,122, 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, 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, 111,116,115,116,114,97,112,62,117,10,0,0,0,95,95,105,
109,112,111,114,116,95,95,99,6,0,0,115,26,0,0,0, 109,112,111,114,116,95,95,109,6,0,0,115,26,0,0,0,
0,11,12,1,15,2,24,1,12,1,18,1,6,3,12,1, 0,11,12,1,15,2,24,1,12,1,18,1,6,3,12,1,
23,1,6,1,4,2,35,1,40,2,117,10,0,0,0,95, 23,1,6,1,4,2,35,1,40,2,117,10,0,0,0,95,
95,105,109,112,111,114,116,95,95,99,2,0,0,0,0,0, 95,105,109,112,111,114,116,95,95,99,2,0,0,0,0,0,
@ -4165,7 +4174,7 @@ unsigned char _Py_M__importlib[] = {
0,0,0,0,117,29,0,0,0,60,102,114,111,122,101,110, 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, 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, 115,116,114,97,112,62,117,9,0,0,0,60,103,101,110,101,
120,112,114,62,158,6,0,0,115,2,0,0,0,6,0,117, 120,112,114,62,168,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, 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, 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,0,117,7,0,0,0,69,77,88,32,71,67,67,105,1,
@ -4222,7 +4231,7 @@ unsigned char _Py_M__importlib[] = {
108,101,40,0,0,0,0,40,0,0,0,0,117,29,0,0, 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, 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, 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,131,6,0,0,115,90,0, 0,0,0,95,115,101,116,117,112,141,6,0,0,115,90,0,
0,0,0,9,6,1,6,2,19,1,15,1,16,2,13,1, 0,0,0,9,6,1,6,2,19,1,15,1,16,2,13,1,
13,1,15,1,18,2,13,1,20,2,48,1,19,2,31,1, 13,1,15,1,18,2,13,1,20,2,48,1,19,2,31,1,
10,1,15,1,13,1,4,2,3,1,15,2,27,1,13,1, 10,1,15,1,13,1,4,2,3,1,15,2,27,1,13,1,
@ -4265,7 +4274,7 @@ unsigned char _Py_M__importlib[] = {
100,101,114,115,40,0,0,0,0,40,0,0,0,0,117,29, 100,101,114,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, 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, 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,200,6,0, 117,8,0,0,0,95,105,110,115,116,97,108,108,210,6,0,
0,115,16,0,0,0,0,2,13,1,9,1,28,1,16,1, 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, 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, 97,108,108,78,40,3,0,0,0,117,3,0,0,0,119,105,
@ -4369,6 +4378,6 @@ unsigned char _Py_M__importlib[] = {
23,12,21,12,8,12,13,12,11,12,51,12,18,12,11,12, 23,12,21,12,8,12,13,12,11,12,51,12,18,12,11,12,
11,12,17,19,57,19,54,19,50,19,82,22,134,19,29,25, 11,12,17,19,57,19,54,19,50,19,82,22,134,19,29,25,
46,25,25,6,3,19,45,19,55,19,18,19,89,19,125,19, 46,25,25,6,3,19,45,19,55,19,18,19,89,19,125,19,
13,12,9,12,17,12,17,6,2,12,46,12,13,18,24,12, 13,12,9,12,17,12,17,6,2,12,50,12,13,18,24,12,
28,12,15,12,11,24,32,12,69, 34,12,15,12,11,24,32,12,69,
}; };