bpo-44885: Correct the ast locations of f-strings with format specs and repeated expressions (GH-27729)

1 files changed, 27 insertions, 27 deletions

diff --git a/Python/importlib_zipimport.h b/Python/importlib_zipimport.h
index 370c980c8fe..c12ed5215b3 100644
--- a/Python/importlib_zipimport.h
+++ b/Python/importlib_zipimport.h
@@ -481,7 +481,7 @@ const unsigned char _Py_M__zipimport[] = {
     0,0,10,7,6,1,20,1,10,2,2,1,2,3,14,254,
     10,2,2,6,12,253,2,128,2,3,2,254,16,2,2,128,
     16,1,115,128,0,0,0,14,30,31,35,37,45,14,46,9,
-    11,12,14,18,22,12,22,9,83,19,33,34,67,35,43,34,
+    11,12,14,18,22,12,22,9,83,19,33,34,67,55,63,34,
     67,34,67,74,82,19,83,19,83,13,83,16,32,33,37,39,
     47,16,48,9,13,12,14,9,36,24,43,24,54,55,59,61,
     74,24,75,13,21,13,21,27,31,24,36,24,36,24,36,13,
@@ -513,7 +513,7 @@ const unsigned char _Py_M__zipimport[] = {
     8,0,0,0,10,6,8,1,18,1,4,1,115,8,0,0,
     0,10,6,6,1,20,1,4,1,115,40,0,0,0,14,30,
     31,35,37,45,14,46,9,11,12,14,18,22,12,22,9,83,
-    19,33,34,67,35,43,34,67,34,67,74,82,19,83,19,83,
+    19,33,34,67,55,63,34,67,34,67,74,82,19,83,19,83,
     13,83,16,18,9,18,114,10,0,0,0,99,2,0,0,0,
     0,0,0,0,0,0,0,0,8,0,0,0,3,0,0,0,
     115,0,1,0,0,100,1,125,2,116,0,106,1,124,2,116,
@@ -607,7 +607,7 @@ const unsigned char _Py_M__zipimport[] = {
     13,37,0,0,9,18,9,18,9,18,17,20,17,28,29,37,
     17,38,13,18,0,0,9,86,19,22,19,30,31,39,19,40,
     13,16,13,16,0,0,9,86,16,24,9,86,9,86,9,86,
-    9,86,19,30,31,85,32,40,31,85,31,85,31,85,19,86,
+    9,86,19,30,31,85,48,56,31,85,31,85,31,85,19,86,
     13,86,9,86,0,0,9,19,9,36,37,69,71,79,81,88,
     9,89,9,89,16,19,9,19,115,23,0,0,0,172,40,65,
     21,0,193,21,9,65,30,7,193,32,5,65,38,0,193,38,
@@ -918,42 +918,42 @@ const unsigned char _Py_M__zipimport[] = {
     2,128,12,2,12,1,20,1,8,1,8,1,4,202,2,6,
     22,48,2,128,12,0,14,1,4,1,115,240,4,0,0,5,
     80,14,17,14,27,28,35,14,36,9,11,9,11,0,0,5,
-    80,12,19,5,80,5,80,5,80,5,80,15,29,30,65,31,
-    38,30,65,30,65,72,79,15,80,15,80,9,80,5,80,0,
+    80,12,19,5,80,5,80,5,80,5,80,15,29,30,65,54,
+    61,30,65,30,65,72,79,15,80,15,80,9,80,5,80,0,
     0,10,12,5,23,5,23,9,84,13,15,13,46,22,42,21,
     42,44,45,13,46,13,46,31,33,31,40,31,40,13,28,22,
     24,22,51,30,50,22,51,13,19,13,19,0,0,9,84,16,
-    23,9,84,9,84,9,84,9,84,19,33,34,69,35,42,34,
+    23,9,84,9,84,9,84,9,84,19,33,34,69,58,65,34,
     69,34,69,76,83,19,84,19,84,13,84,9,84,0,0,12,
-    15,16,22,12,23,27,47,12,47,9,84,19,33,34,69,35,
-    42,34,69,34,69,76,83,19,84,19,84,13,84,12,18,19,
+    15,16,22,12,23,27,47,12,47,9,84,19,33,34,69,58,
+    65,34,69,34,69,76,83,19,84,19,84,13,84,12,18,19,
     21,20,21,19,21,12,22,26,44,12,44,9,58,13,51,17,
     19,17,30,25,26,28,29,17,30,17,30,29,31,29,38,29,
     38,17,26,17,26,0,0,13,51,20,27,13,51,13,51,13,
-    51,13,51,23,37,38,73,39,46,38,73,38,73,43,50,23,
+    51,13,51,23,37,38,73,62,69,38,73,38,73,43,50,23,
     51,23,51,17,51,13,51,0,0,33,36,37,46,49,64,37,
     64,37,57,37,57,59,60,33,61,13,30,13,51,17,19,17,
     43,25,42,17,43,17,43,24,26,24,33,24,33,17,21,17,
     21,0,0,13,51,20,27,13,51,13,51,13,51,13,51,23,
-    37,38,73,39,46,38,73,38,73,43,50,23,51,23,51,17,
+    37,38,73,62,69,38,73,38,73,43,50,23,51,23,51,17,
     51,13,51,0,0,19,23,19,49,30,48,19,49,13,16,16,
-    19,22,23,16,23,13,51,23,37,38,68,39,46,38,68,38,
+    19,22,23,16,23,13,51,23,37,38,68,57,64,38,68,38,
     68,43,50,23,51,23,51,17,51,22,26,27,30,31,34,35,
     55,31,55,27,55,22,56,13,19,16,19,20,26,16,27,31,
-    51,16,51,13,51,23,37,38,70,39,46,38,70,38,70,43,
+    51,16,51,13,51,23,37,38,70,59,66,38,70,38,70,43,
     50,23,51,23,51,17,51,31,40,43,46,47,51,43,52,31,
     52,55,58,31,58,13,28,23,37,38,44,45,47,48,50,45,
     50,38,51,23,52,9,20,25,39,40,46,47,49,50,52,47,
     52,40,53,25,54,9,22,12,27,30,41,12,41,9,91,19,
-    33,34,76,35,42,34,76,34,76,83,90,19,91,19,91,13,
-    91,12,27,30,43,12,43,9,93,19,33,34,78,35,42,34,
+    33,34,76,65,72,34,76,34,76,83,90,19,91,19,91,13,
+    91,12,27,30,43,12,43,9,93,19,33,34,78,67,74,34,
     78,34,78,85,92,19,93,19,93,13,93,9,24,28,39,9,
     39,9,24,22,37,40,53,22,53,9,19,12,22,25,26,12,
-    26,9,101,9,101,19,33,34,86,35,42,34,86,34,86,93,
+    26,9,101,9,101,19,33,34,86,75,82,34,86,34,86,93,
     100,19,101,19,101,13,101,17,19,9,14,17,18,9,14,9,
     84,13,15,13,37,21,36,13,37,13,37,13,37,0,0,9,
     84,16,23,9,84,9,84,9,84,9,84,9,84,19,33,34,
-    69,35,42,34,69,34,69,76,83,19,84,19,84,13,84,9,
+    69,58,65,34,69,34,69,76,83,19,84,19,84,13,84,9,
     84,0,0,15,19,22,24,22,33,30,32,22,33,13,19,16,
     19,20,26,16,27,30,31,16,31,13,62,13,62,23,31,32,
     61,23,62,17,62,16,22,23,25,24,25,23,25,16,26,30,
@@ -971,18 +971,18 @@ const unsigned char _Py_M__zipimport[] = {
     23,28,42,43,49,50,52,53,55,50,55,43,56,28,57,13,
     25,27,41,42,48,49,51,52,54,49,54,42,55,27,56,13,
     24,27,36,39,49,27,49,52,64,27,64,13,24,16,27,30,
-    43,16,43,13,92,13,92,23,37,38,77,39,46,38,77,38,
+    43,16,43,13,92,13,92,23,37,38,77,66,73,38,77,38,
     77,84,91,23,92,23,92,17,92,13,24,28,38,13,38,13,
     24,13,88,24,26,24,42,32,41,24,42,17,21,17,21,0,
     0,13,88,20,27,13,88,13,88,13,88,13,88,13,88,23,
-    37,38,73,39,46,38,73,38,73,80,87,23,88,23,88,17,
+    37,38,73,62,69,38,73,38,73,80,87,23,88,23,88,17,
     88,13,88,0,0,16,19,20,24,16,25,29,38,16,38,13,
-    88,13,88,23,37,38,73,39,46,38,73,38,73,80,87,23,
+    88,13,88,23,37,38,73,62,69,38,73,38,73,80,87,23,
     88,23,88,17,88,13,88,20,23,24,26,24,56,32,43,46,
     55,32,55,24,56,20,57,61,72,75,84,61,84,20,84,17,
-    92,17,92,27,41,42,77,43,50,42,77,42,77,84,91,27,
+    92,17,92,27,41,42,77,66,73,42,77,42,77,84,91,27,
     92,27,92,21,92,17,92,0,0,13,88,20,27,13,88,13,
-    88,13,88,13,88,13,88,23,37,38,73,39,46,38,73,38,
+    88,13,88,13,88,13,88,23,37,38,73,62,69,38,73,38,
     73,80,87,23,88,23,88,17,88,13,88,0,0,16,21,24,
     29,16,29,13,72,13,72,24,28,24,37,24,37,17,21,17,
     21,17,72,28,32,28,48,40,47,28,48,21,25,21,25,0,
@@ -1137,17 +1137,17 @@ const unsigned char _Py_M__zipimport[] = {
     29,30,50,15,51,9,51,10,13,10,23,24,31,10,32,5,
     56,36,38,9,84,13,15,13,33,21,32,13,33,13,33,13,
     33,0,0,9,84,16,23,9,84,9,84,9,84,9,84,19,
-    33,34,69,35,42,34,69,34,69,76,83,19,84,19,84,13,
+    33,34,69,58,65,34,69,34,69,76,83,19,84,19,84,13,
     84,9,84,0,0,18,20,18,29,26,28,18,29,9,15,12,
     15,16,22,12,23,27,29,12,29,9,58,19,27,28,57,19,
     58,13,58,12,18,19,21,20,21,19,21,12,22,26,39,12,
-    39,9,86,19,33,34,71,35,42,34,71,34,71,78,85,19,
+    39,9,86,19,33,34,71,60,67,34,71,34,71,78,85,19,
     86,19,86,13,86,21,35,36,42,43,45,46,48,43,48,36,
     49,21,50,9,18,22,36,37,43,44,46,47,49,44,49,37,
     50,22,51,9,19,23,25,28,37,23,37,40,50,23,50,9,
     20,9,20,24,35,9,35,9,20,9,84,13,15,13,33,21,
     32,13,33,13,33,13,33,0,0,9,84,16,23,9,84,9,
-    84,9,84,9,84,19,33,34,69,35,42,34,69,34,69,76,
+    84,9,84,9,84,19,33,34,69,58,65,34,69,34,69,76,
     83,19,84,19,84,13,84,9,84,0,0,20,22,20,38,28,
     37,20,38,9,17,12,15,16,24,12,25,29,38,12,38,9,
     56,19,26,27,55,19,56,13,56,9,56,5,56,5,56,5,
@@ -1241,10 +1241,10 @@ const unsigned char _Py_M__zipimport[] = {
     57,13,58,9,34,9,21,23,34,12,24,9,28,21,30,31,
     45,46,50,51,52,53,55,51,55,46,56,31,57,59,71,21,
     72,13,28,21,35,36,40,41,43,44,46,41,46,36,47,21,
-    48,52,63,21,63,13,28,17,27,17,44,21,58,22,30,21,
+    48,52,63,21,63,13,28,17,27,17,44,21,58,46,54,21,
     58,21,58,17,59,17,59,24,28,24,28,12,19,12,25,26,
     30,31,33,31,34,31,34,26,35,12,36,5,9,12,22,23,
-    27,29,39,12,40,5,78,15,24,25,77,26,34,25,77,25,
+    27,29,39,12,40,5,78,15,24,25,77,44,52,25,77,25,
     77,25,77,15,78,9,78,12,16,5,16,114,10,0,0,0,
     99,1,0,0,0,0,0,0,0,0,0,0,0,4,0,0,
     0,3,0,0,0,115,28,0,0,0,124,0,160,0,100,1,
@@ -1402,7 +1402,7 @@ const unsigned char _Py_M__zipimport[] = {
     25,23,32,33,34,23,35,13,20,20,24,26,35,37,44,20,
     44,13,44,13,44,13,44,12,24,9,83,19,56,42,54,19,
     56,19,56,13,16,19,33,34,37,44,52,19,53,19,53,59,
-    71,13,71,19,33,34,67,35,43,34,67,34,67,74,82,19,
+    71,13,71,19,33,34,67,55,63,34,67,34,67,74,82,19,
     83,19,83,13,83,115,35,0,0,0,158,5,36,2,164,7,
     46,9,173,1,46,9,190,8,65,7,2,193,7,7,65,26,
     9,193,14,2,65,21,9,193,21,5,65,26,9,41,46,114,