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

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.

1 files changed, 198 insertions, 189 deletions

diff --git a/Python/importlib.h b/Python/importlib.h
index bb9b003b28..c064ab92f6 100644
--- a/Python/importlib.h
+++ b/Python/importlib.h
@@ -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,
     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,
-    123,33,114,125,99,2,0,0,0,0,0,0,0,8,0,0,
-    0,27,0,0,0,67,0,0,0,115,253,1,0,0,100,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,12,2,0,0,100,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,
     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,
     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,
-    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,
-    131,1,1,130,1,0,110,47,0,124,0,0,116,2,0,106,
-    3,0,107,7,0,114,26,1,124,6,0,106,11,0,124,0,
-    0,131,1,0,1,116,12,0,100,5,0,124,0,0,124,6,
-    0,131,3,0,1,110,0,0,116,2,0,106,3,0,124,0,
-    0,25,125,7,0,124,3,0,114,90,1,116,2,0,106,3,
-    0,124,3,0,25,125,4,0,116,13,0,124,4,0,124,0,
-    0,106,1,0,100,1,0,131,1,0,100,6,0,25,124,7,
-    0,131,3,0,1,110,0,0,116,14,0,124,7,0,100,7,
-    0,100,0,0,131,3,0,100,0,0,107,8,0,114,197,1,
-    121,59,0,124,7,0,106,15,0,124,7,0,95,16,0,116,
-    17,0,124,7,0,100,8,0,131,2,0,115,172,1,124,7,
-    0,106,16,0,106,1,0,100,1,0,131,1,0,100,2,0,
-    25,124,7,0,95,16,0,110,0,0,87,113,197,1,4,116,
-    6,0,107,10,0,114,193,1,1,1,1,89,113,197,1,88,
-    110,0,0,116,17,0,124,7,0,100,9,0,131,2,0,115,
-    249,1,121,13,0,124,6,0,124,7,0,95,18,0,87,113,
-    249,1,4,116,6,0,107,10,0,114,245,1,1,1,1,89,
-    113,249,1,88,110,0,0,124,7,0,83,40,10,0,0,0,
-    78,117,1,0,0,0,46,105,0,0,0,0,117,21,0,0,
-    0,59,32,123,125,32,105,115,32,110,111,116,32,97,32,112,
-    97,99,107,97,103,101,117,4,0,0,0,110,97,109,101,117,
-    18,0,0,0,105,109,112,111,114,116,32,123,33,114,125,32,
-    35,32,123,33,114,125,105,2,0,0,0,117,11,0,0,0,
-    95,95,112,97,99,107,97,103,101,95,95,117,8,0,0,0,
-    95,95,112,97,116,104,95,95,117,10,0,0,0,95,95,108,
-    111,97,100,101,114,95,95,40,19,0,0,0,117,4,0,0,
+    131,1,1,125,7,0,100,10,0,124,7,0,95,12,0,124,
+    7,0,130,1,0,110,47,0,124,0,0,116,2,0,106,3,
+    0,107,7,0,114,41,1,124,6,0,106,13,0,124,0,0,
+    131,1,0,1,116,14,0,100,5,0,124,0,0,124,6,0,
+    131,3,0,1,110,0,0,116,2,0,106,3,0,124,0,0,
+    25,125,8,0,124,3,0,114,105,1,116,2,0,106,3,0,
+    124,3,0,25,125,4,0,116,15,0,124,4,0,124,0,0,
+    106,1,0,100,1,0,131,1,0,100,6,0,25,124,8,0,
+    131,3,0,1,110,0,0,116,16,0,124,8,0,100,7,0,
+    100,0,0,131,3,0,100,0,0,107,8,0,114,212,1,121,
+    59,0,124,8,0,106,17,0,124,8,0,95,18,0,116,19,
+    0,124,8,0,100,8,0,131,2,0,115,187,1,124,8,0,
+    106,18,0,106,1,0,100,1,0,131,1,0,100,2,0,25,
+    124,8,0,95,18,0,110,0,0,87,113,212,1,4,116,6,
+    0,107,10,0,114,208,1,1,1,1,89,113,212,1,88,110,
+    0,0,116,19,0,124,8,0,100,9,0,131,2,0,115,8,
+    2,121,13,0,124,6,0,124,8,0,95,20,0,87,113,8,
+    2,4,116,6,0,107,10,0,114,4,2,1,1,1,89,113,
+    8,2,88,110,0,0,124,8,0,83,40,11,0,0,0,78,
+    117,1,0,0,0,46,105,0,0,0,0,117,21,0,0,0,
+    59,32,123,125,32,105,115,32,110,111,116,32,97,32,112,97,
+    99,107,97,103,101,117,4,0,0,0,110,97,109,101,117,18,
+    0,0,0,105,109,112,111,114,116,32,123,33,114,125,32,35,
+    32,123,33,114,125,105,2,0,0,0,117,11,0,0,0,95,
+    95,112,97,99,107,97,103,101,95,95,117,8,0,0,0,95,
+    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,
     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,
@@ -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,
     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,
-    11,0,0,0,108,111,97,100,95,109,111,100,117,108,101,117,
-    16,0,0,0,95,118,101,114,98,111,115,101,95,109,101,115,
-    115,97,103,101,117,7,0,0,0,115,101,116,97,116,116,114,
-    117,7,0,0,0,103,101,116,97,116,116,114,117,8,0,0,
-    0,95,95,110,97,109,101,95,95,117,11,0,0,0,95,95,
-    112,97,99,107,97,103,101,95,95,117,7,0,0,0,104,97,
-    115,97,116,116,114,117,10,0,0,0,95,95,108,111,97,100,
-    101,114,95,95,40,8,0,0,0,117,4,0,0,0,110,97,
-    109,101,117,7,0,0,0,105,109,112,111,114,116,95,117,4,
-    0,0,0,112,97,116,104,117,6,0,0,0,112,97,114,101,
-    110,116,117,13,0,0,0,112,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,6,0,0,0,109,111,100,117,
+    4,0,0,0,84,114,117,101,117,10,0,0,0,95,110,111,
+    116,95,102,111,117,110,100,117,11,0,0,0,108,111,97,100,
+    95,109,111,100,117,108,101,117,16,0,0,0,95,118,101,114,
+    98,111,115,101,95,109,101,115,115,97,103,101,117,7,0,0,
+    0,115,101,116,97,116,116,114,117,7,0,0,0,103,101,116,
+    97,116,116,114,117,8,0,0,0,95,95,110,97,109,101,95,
+    95,117,11,0,0,0,95,95,112,97,99,107,97,103,101,95,
+    95,117,7,0,0,0,104,97,115,97,116,116,114,117,10,0,
+    0,0,95,95,108,111,97,100,101,114,95,95,40,9,0,0,
+    0,117,4,0,0,0,110,97,109,101,117,7,0,0,0,105,
+    109,112,111,114,116,95,117,4,0,0,0,112,97,116,104,117,
+    6,0,0,0,112,97,114,101,110,116,117,13,0,0,0,112,
+    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,
     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,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,
     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,32,2,24,1,3,1,12,1,15,1,32,1,13,1,8,
-    2,15,1,3,1,13,1,13,1,8,1,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,99,2,0,0,0,0,0,0,0,
-    3,0,0,0,18,0,0,0,67,0,0,0,115,75,0,0,
-    0,122,16,0,116,0,0,124,0,0,131,1,0,125,2,0,
-    87,100,1,0,116,1,0,106,2,0,131,0,0,1,88,124,
-    2,0,106,3,0,131,0,0,1,122,17,0,116,4,0,124,
-    0,0,124,1,0,131,2,0,83,87,100,1,0,124,2,0,
-    106,5,0,131,0,0,1,88,100,1,0,83,40,2,0,0,
-    0,117,54,0,0,0,70,105,110,100,32,97,110,100,32,108,
-    111,97,100,32,116,104,101,32,109,111,100,117,108,101,44,32,
-    97,110,100,32,114,101,108,101,97,115,101,32,116,104,101,32,
-    105,109,112,111,114,116,32,108,111,99,107,46,78,40,6,0,
-    0,0,117,16,0,0,0,95,103,101,116,95,109,111,100,117,
-    108,101,95,108,111,99,107,117,4,0,0,0,95,105,109,112,
-    117,12,0,0,0,114,101,108,101,97,115,101,95,108,111,99,
-    107,117,7,0,0,0,97,99,113,117,105,114,101,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,117,7,0,0,0,114,101,
-    108,101,97,115,101,40,3,0,0,0,117,4,0,0,0,110,
-    97,109,101,117,7,0,0,0,105,109,112,111,114,116,95,117,
-    4,0,0,0,108,111,99,107,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,14,0,0,0,95,102,105,110,100,95,97,
-    110,100,95,108,111,97,100,8,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,67,0,0,0,115,172,0,0,0,116,0,0,124,0,
-    0,124,1,0,124,2,0,131,3,0,1,124,2,0,100,1,
-    0,107,4,0,114,49,0,116,1,0,124,0,0,124,1,0,
-    124,2,0,131,3,0,125,0,0,110,0,0,116,2,0,106,
-    3,0,131,0,0,1,124,0,0,116,4,0,106,5,0,107,
-    7,0,114,87,0,116,6,0,124,0,0,116,7,0,131,2,
-    0,83,116,4,0,106,5,0,124,0,0,25,125,3,0,124,
-    3,0,100,4,0,107,8,0,114,158,0,116,2,0,106,9,
-    0,131,0,0,1,100,2,0,106,10,0,124,0,0,131,1,
-    0,125,4,0,116,11,0,124,4,0,100,3,0,124,0,0,
-    131,1,1,130,1,0,110,0,0,116,12,0,124,0,0,131,
-    1,0,1,124,3,0,83,40,5,0,0,0,117,50,1,0,
-    0,73,109,112,111,114,116,32,97,110,100,32,114,101,116,117,
-    114,110,32,116,104,101,32,109,111,100,117,108,101,32,98,97,
-    115,101,100,32,111,110,32,105,116,115,32,110,97,109,101,44,
-    32,116,104,101,32,112,97,99,107,97,103,101,32,116,104,101,
-    32,99,97,108,108,32,105,115,10,32,32,32,32,98,101,105,
-    110,103,32,109,97,100,101,32,102,114,111,109,44,32,97,110,
-    100,32,116,104,101,32,108,101,118,101,108,32,97,100,106,117,
-    115,116,109,101,110,116,46,10,10,32,32,32,32,84,104,105,
-    115,32,102,117,110,99,116,105,111,110,32,114,101,112,114,101,
-    115,101,110,116,115,32,116,104,101,32,103,114,101,97,116,101,
-    115,116,32,99,111,109,109,111,110,32,100,101,110,111,109,105,
-    110,97,116,111,114,32,111,102,32,102,117,110,99,116,105,111,
-    110,97,108,105,116,121,10,32,32,32,32,98,101,116,119,101,
-    101,110,32,105,109,112,111,114,116,95,109,111,100,117,108,101,
-    32,97,110,100,32,95,95,105,109,112,111,114,116,95,95,46,
-    32,84,104,105,115,32,105,110,99,108,117,100,101,115,32,115,
-    101,116,116,105,110,103,32,95,95,112,97,99,107,97,103,101,
-    95,95,32,105,102,10,32,32,32,32,116,104,101,32,108,111,
-    97,100,101,114,32,100,105,100,32,110,111,116,46,10,10,32,
-    32,32,32,105,0,0,0,0,117,40,0,0,0,105,109,112,
-    111,114,116,32,111,102,32,123,125,32,104,97,108,116,101,100,
-    59,32,78,111,110,101,32,105,110,32,115,121,115,46,109,111,
-    100,117,108,101,115,117,4,0,0,0,110,97,109,101,78,40,
-    13,0,0,0,117,13,0,0,0,95,115,97,110,105,116,121,
-    95,99,104,101,99,107,117,13,0,0,0,95,114,101,115,111,
-    108,118,101,95,110,97,109,101,117,4,0,0,0,95,105,109,
-    112,117,12,0,0,0,97,99,113,117,105,114,101,95,108,111,
-    99,107,117,3,0,0,0,115,121,115,117,7,0,0,0,109,
-    111,100,117,108,101,115,117,14,0,0,0,95,102,105,110,100,
-    95,97,110,100,95,108,111,97,100,117,11,0,0,0,95,103,
-    99,100,95,105,109,112,111,114,116,117,4,0,0,0,78,111,
-    110,101,117,12,0,0,0,114,101,108,101,97,115,101,95,108,
-    111,99,107,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,19,
-    0,0,0,95,108,111,99,107,95,117,110,108,111,99,107,95,
-    109,111,100,117,108,101,40,5,0,0,0,117,4,0,0,0,
-    110,97,109,101,117,7,0,0,0,112,97,99,107,97,103,101,
-    117,5,0,0,0,108,101,118,101,108,117,6,0,0,0,109,
-    111,100,117,108,101,117,7,0,0,0,109,101,115,115,97,103,
-    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,103,99,100,95,105,109,112,111,114,116,21,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,99,3,0,0,0,0,0,0,0,4,0,0,0,12,
-    0,0,0,67,0,0,0,115,184,0,0,0,116,0,0,124,
-    0,0,100,1,0,131,2,0,114,180,0,100,2,0,124,1,
-    0,107,6,0,114,89,0,116,1,0,124,1,0,131,1,0,
-    125,1,0,124,1,0,106,2,0,100,2,0,131,1,0,1,
-    116,0,0,124,0,0,100,3,0,131,2,0,114,89,0,124,
-    1,0,106,3,0,124,0,0,106,4,0,131,1,0,1,113,
-    89,0,110,0,0,120,88,0,124,1,0,68,93,77,0,125,
-    3,0,116,0,0,124,0,0,124,3,0,131,2,0,115,96,
-    0,121,32,0,116,5,0,124,2,0,100,4,0,106,6,0,
-    124,0,0,106,7,0,124,3,0,131,2,0,131,2,0,1,
-    87,113,173,0,4,116,8,0,107,10,0,114,169,0,1,1,
-    1,89,113,173,0,88,113,96,0,113,96,0,87,110,0,0,
-    124,0,0,83,40,5,0,0,0,117,238,0,0,0,70,105,
-    103,117,114,101,32,111,117,116,32,119,104,97,116,32,95,95,
-    105,109,112,111,114,116,95,95,32,115,104,111,117,108,100,32,
-    114,101,116,117,114,110,46,10,10,32,32,32,32,84,104,101,
-    32,105,109,112,111,114,116,95,32,112,97,114,97,109,101,116,
-    101,114,32,105,115,32,97,32,99,97,108,108,97,98,108,101,
-    32,119,104,105,99,104,32,116,97,107,101,115,32,116,104,101,
-    32,110,97,109,101,32,111,102,32,109,111,100,117,108,101,32,
-    116,111,10,32,32,32,32,105,109,112,111,114,116,46,32,73,
-    116,32,105,115,32,114,101,113,117,105,114,101,100,32,116,111,
-    32,100,101,99,111,117,112,108,101,32,116,104,101,32,102,117,
-    110,99,116,105,111,110,32,102,114,111,109,32,97,115,115,117,
-    109,105,110,103,32,105,109,112,111,114,116,108,105,98,39,115,
-    10,32,32,32,32,105,109,112,111,114,116,32,105,109,112,108,
-    101,109,101,110,116,97,116,105,111,110,32,105,115,32,100,101,
-    115,105,114,101,100,46,10,10,32,32,32,32,117,8,0,0,
-    0,95,95,112,97,116,104,95,95,117,1,0,0,0,42,117,
-    7,0,0,0,95,95,97,108,108,95,95,117,5,0,0,0,
-    123,125,46,123,125,40,9,0,0,0,117,7,0,0,0,104,
-    97,115,97,116,116,114,117,4,0,0,0,108,105,115,116,117,
-    6,0,0,0,114,101,109,111,118,101,117,6,0,0,0,101,
-    120,116,101,110,100,117,7,0,0,0,95,95,97,108,108,95,
-    95,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,
-    6,0,0,0,102,111,114,109,97,116,117,8,0,0,0,95,
-    95,110,97,109,101,95,95,117,11,0,0,0,73,109,112,111,
-    114,116,69,114,114,111,114,40,4,0,0,0,117,6,0,0,
-    0,109,111,100,117,108,101,117,8,0,0,0,102,114,111,109,
-    108,105,115,116,117,7,0,0,0,105,109,112,111,114,116,95,
-    117,1,0,0,0,120,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,45,6,0,0,115,28,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,13,3,15,1,117,16,0,0,
+    1,12,1,27,3,9,1,9,1,15,2,13,1,19,2,13,
+    1,6,2,13,1,32,2,24,1,3,1,12,1,15,1,32,
+    1,13,1,8,2,15,1,3,1,13,1,13,1,8,1,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,99,2,0,0,0,
+    0,0,0,0,3,0,0,0,18,0,0,0,67,0,0,0,
+    115,75,0,0,0,122,16,0,116,0,0,124,0,0,131,1,
+    0,125,2,0,87,100,1,0,116,1,0,106,2,0,131,0,
+    0,1,88,124,2,0,106,3,0,131,0,0,1,122,17,0,
+    116,4,0,124,0,0,124,1,0,131,2,0,83,87,100,1,
+    0,124,2,0,106,5,0,131,0,0,1,88,100,1,0,83,
+    40,2,0,0,0,117,54,0,0,0,70,105,110,100,32,97,
+    110,100,32,108,111,97,100,32,116,104,101,32,109,111,100,117,
+    108,101,44,32,97,110,100,32,114,101,108,101,97,115,101,32,
+    116,104,101,32,105,109,112,111,114,116,32,108,111,99,107,46,
+    78,40,6,0,0,0,117,16,0,0,0,95,103,101,116,95,
+    109,111,100,117,108,101,95,108,111,99,107,117,4,0,0,0,
+    95,105,109,112,117,12,0,0,0,114,101,108,101,97,115,101,
+    95,108,111,99,107,117,7,0,0,0,97,99,113,117,105,114,
+    101,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,117,7,0,
+    0,0,114,101,108,101,97,115,101,40,3,0,0,0,117,4,
+    0,0,0,110,97,109,101,117,7,0,0,0,105,109,112,111,
+    114,116,95,117,4,0,0,0,108,111,99,107,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,14,0,0,0,95,102,105,
+    110,100,95,97,110,100,95,108,111,97,100,12,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,67,0,0,0,115,172,0,0,0,116,
+    0,0,124,0,0,124,1,0,124,2,0,131,3,0,1,124,
+    2,0,100,1,0,107,4,0,114,49,0,116,1,0,124,0,
+    0,124,1,0,124,2,0,131,3,0,125,0,0,110,0,0,
+    116,2,0,106,3,0,131,0,0,1,124,0,0,116,4,0,
+    106,5,0,107,7,0,114,87,0,116,6,0,124,0,0,116,
+    7,0,131,2,0,83,116,4,0,106,5,0,124,0,0,25,
+    125,3,0,124,3,0,100,4,0,107,8,0,114,158,0,116,
+    2,0,106,9,0,131,0,0,1,100,2,0,106,10,0,124,
+    0,0,131,1,0,125,4,0,116,11,0,124,4,0,100,3,
+    0,124,0,0,131,1,1,130,1,0,110,0,0,116,12,0,
+    124,0,0,131,1,0,1,124,3,0,83,40,5,0,0,0,
+    117,50,1,0,0,73,109,112,111,114,116,32,97,110,100,32,
+    114,101,116,117,114,110,32,116,104,101,32,109,111,100,117,108,
+    101,32,98,97,115,101,100,32,111,110,32,105,116,115,32,110,
+    97,109,101,44,32,116,104,101,32,112,97,99,107,97,103,101,
+    32,116,104,101,32,99,97,108,108,32,105,115,10,32,32,32,
+    32,98,101,105,110,103,32,109,97,100,101,32,102,114,111,109,
+    44,32,97,110,100,32,116,104,101,32,108,101,118,101,108,32,
+    97,100,106,117,115,116,109,101,110,116,46,10,10,32,32,32,
+    32,84,104,105,115,32,102,117,110,99,116,105,111,110,32,114,
+    101,112,114,101,115,101,110,116,115,32,116,104,101,32,103,114,
+    101,97,116,101,115,116,32,99,111,109,109,111,110,32,100,101,
+    110,111,109,105,110,97,116,111,114,32,111,102,32,102,117,110,
+    99,116,105,111,110,97,108,105,116,121,10,32,32,32,32,98,
+    101,116,119,101,101,110,32,105,109,112,111,114,116,95,109,111,
+    100,117,108,101,32,97,110,100,32,95,95,105,109,112,111,114,
+    116,95,95,46,32,84,104,105,115,32,105,110,99,108,117,100,
+    101,115,32,115,101,116,116,105,110,103,32,95,95,112,97,99,
+    107,97,103,101,95,95,32,105,102,10,32,32,32,32,116,104,
+    101,32,108,111,97,100,101,114,32,100,105,100,32,110,111,116,
+    46,10,10,32,32,32,32,105,0,0,0,0,117,40,0,0,
+    0,105,109,112,111,114,116,32,111,102,32,123,125,32,104,97,
+    108,116,101,100,59,32,78,111,110,101,32,105,110,32,115,121,
+    115,46,109,111,100,117,108,101,115,117,4,0,0,0,110,97,
+    109,101,78,40,13,0,0,0,117,13,0,0,0,95,115,97,
+    110,105,116,121,95,99,104,101,99,107,117,13,0,0,0,95,
+    114,101,115,111,108,118,101,95,110,97,109,101,117,4,0,0,
+    0,95,105,109,112,117,12,0,0,0,97,99,113,117,105,114,
+    101,95,108,111,99,107,117,3,0,0,0,115,121,115,117,7,
+    0,0,0,109,111,100,117,108,101,115,117,14,0,0,0,95,
+    102,105,110,100,95,97,110,100,95,108,111,97,100,117,11,0,
+    0,0,95,103,99,100,95,105,109,112,111,114,116,117,4,0,
+    0,0,78,111,110,101,117,12,0,0,0,114,101,108,101,97,
+    115,101,95,108,111,99,107,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,19,0,0,0,95,108,111,99,107,95,117,110,108,
+    111,99,107,95,109,111,100,117,108,101,40,5,0,0,0,117,
+    4,0,0,0,110,97,109,101,117,7,0,0,0,112,97,99,
+    107,97,103,101,117,5,0,0,0,108,101,118,101,108,117,6,
+    0,0,0,109,111,100,117,108,101,117,7,0,0,0,109,101,
+    115,115,97,103,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,103,99,100,95,105,109,112,111,114,
+    116,25,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,99,3,0,0,0,0,0,0,0,5,
+    0,0,0,17,0,0,0,67,0,0,0,115,233,0,0,0,
+    116,0,0,124,0,0,100,1,0,131,2,0,114,229,0,100,
+    2,0,124,1,0,107,6,0,114,89,0,116,1,0,124,1,
+    0,131,1,0,125,1,0,124,1,0,106,2,0,100,2,0,
+    131,1,0,1,116,0,0,124,0,0,100,3,0,131,2,0,
+    114,89,0,124,1,0,106,3,0,124,0,0,106,4,0,131,
+    1,0,1,113,89,0,110,0,0,120,137,0,124,1,0,68,
+    93,126,0,125,3,0,116,0,0,124,0,0,124,3,0,131,
+    2,0,115,96,0,121,32,0,116,5,0,124,2,0,100,4,
+    0,106,6,0,124,0,0,106,7,0,124,3,0,131,2,0,
+    131,2,0,1,87,113,222,0,4,116,8,0,107,10,0,114,
+    218,0,1,125,4,0,1,122,35,0,116,0,0,124,4,0,
+    100,5,0,131,2,0,114,197,0,124,4,0,106,9,0,114,
+    197,0,110,3,0,130,0,0,87,89,100,6,0,100,6,0,
+    125,4,0,126,4,0,88,113,222,0,88,113,96,0,113,96,
+    0,87,110,0,0,124,0,0,83,40,7,0,0,0,117,238,
+    0,0,0,70,105,103,117,114,101,32,111,117,116,32,119,104,
+    97,116,32,95,95,105,109,112,111,114,116,95,95,32,115,104,
+    111,117,108,100,32,114,101,116,117,114,110,46,10,10,32,32,
+    32,32,84,104,101,32,105,109,112,111,114,116,95,32,112,97,
+    114,97,109,101,116,101,114,32,105,115,32,97,32,99,97,108,
+    108,97,98,108,101,32,119,104,105,99,104,32,116,97,107,101,
+    115,32,116,104,101,32,110,97,109,101,32,111,102,32,109,111,
+    100,117,108,101,32,116,111,10,32,32,32,32,105,109,112,111,
+    114,116,46,32,73,116,32,105,115,32,114,101,113,117,105,114,
+    101,100,32,116,111,32,100,101,99,111,117,112,108,101,32,116,
+    104,101,32,102,117,110,99,116,105,111,110,32,102,114,111,109,
+    32,97,115,115,117,109,105,110,103,32,105,109,112,111,114,116,
+    108,105,98,39,115,10,32,32,32,32,105,109,112,111,114,116,
+    32,105,109,112,108,101,109,101,110,116,97,116,105,111,110,32,
+    105,115,32,100,101,115,105,114,101,100,46,10,10,32,32,32,
+    32,117,8,0,0,0,95,95,112,97,116,104,95,95,117,1,
+    0,0,0,42,117,7,0,0,0,95,95,97,108,108,95,95,
+    117,5,0,0,0,123,125,46,123,125,117,10,0,0,0,95,
+    110,111,116,95,102,111,117,110,100,78,40,10,0,0,0,117,
+    7,0,0,0,104,97,115,97,116,116,114,117,4,0,0,0,
+    108,105,115,116,117,6,0,0,0,114,101,109,111,118,101,117,
+    6,0,0,0,101,120,116,101,110,100,117,7,0,0,0,95,
+    95,97,108,108,95,95,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,6,0,0,0,102,111,114,109,97,116,117,
+    8,0,0,0,95,95,110,97,109,101,95,95,117,11,0,0,
+    0,73,109,112,111,114,116,69,114,114,111,114,117,10,0,0,
+    0,95,110,111,116,95,102,111,117,110,100,40,5,0,0,0,
+    117,6,0,0,0,109,111,100,117,108,101,117,8,0,0,0,
+    102,114,111,109,108,105,115,116,117,7,0,0,0,105,109,112,
+    111,114,116,95,117,1,0,0,0,120,117,3,0,0,0,101,
+    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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,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,
     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,
@@ -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,
     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,
-    13,12,9,12,17,12,17,6,2,12,46,12,13,18,24,12,
-    28,12,15,12,11,24,32,12,69,
+    13,12,9,12,17,12,17,6,2,12,50,12,13,18,24,12,
+    34,12,15,12,11,24,32,12,69,
 };