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

1 files changed, 12 insertions, 12 deletions

diff --git a/Python/importlib_external.h b/Python/importlib_external.h
index 1572d0d4d9..c49fa5516e 100644
--- a/Python/importlib_external.h
+++ b/Python/importlib_external.h
@@ -685,15 +685,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     41,44,52,28,52,12,53,9,43,20,24,25,28,29,42,25,
     43,25,44,25,44,20,45,13,17,39,43,13,36,12,35,5,
     42,25,36,37,41,25,42,9,22,9,13,15,22,12,19,23,
-    31,12,31,9,42,19,29,33,41,30,41,30,41,31,35,30,
+    31,12,31,9,42,19,29,33,41,30,41,30,41,33,37,30,
     41,30,41,19,42,13,42,17,33,17,44,40,43,17,44,5,
-    14,8,17,25,31,8,31,5,51,15,25,26,78,27,43,26,
+    14,8,17,25,31,8,31,5,51,15,25,26,78,58,74,26,
     78,26,78,15,79,9,79,10,19,23,24,10,24,5,51,24,
     40,24,55,48,51,53,54,24,55,56,58,24,59,9,21,16,
-    28,16,45,40,44,16,45,9,47,19,29,30,46,31,35,30,
+    28,16,45,40,44,16,45,9,47,19,29,30,46,38,42,30,
     46,30,46,19,47,13,47,21,33,34,37,38,42,34,43,34,
     44,34,44,21,45,9,18,16,25,16,35,16,35,9,51,19,
-    29,30,50,31,43,30,50,30,50,30,50,19,51,13,51,21,
+    29,30,50,52,64,30,50,30,50,30,50,19,51,13,51,21,
     37,21,52,48,51,21,52,53,54,21,55,5,18,12,22,23,
     27,29,42,45,60,61,62,45,63,29,63,12,64,5,64,114,
     10,0,0,0,99,1,0,0,0,0,0,0,0,0,0,0,
@@ -974,15 +974,15 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     16,6,1,2,3,16,254,12,1,16,1,10,1,2,3,10,
     254,12,1,8,1,16,1,6,2,2,2,16,255,16,1,4,
     1,115,166,0,0,0,13,17,18,20,19,20,18,20,13,21,
-    5,10,8,13,17,29,8,29,5,50,19,61,20,24,19,61,
-    19,61,20,25,19,61,19,61,9,16,9,19,9,51,37,41,
+    5,10,8,13,17,29,8,29,5,50,19,61,42,46,19,61,
+    19,61,52,57,19,61,19,61,9,16,9,19,9,51,37,41,
     43,50,9,51,9,51,15,26,27,34,15,50,15,50,38,49,
     15,50,15,50,9,50,8,11,12,16,8,17,20,22,8,22,
-    5,32,19,70,20,24,19,70,19,70,9,16,9,19,9,51,
+    5,32,19,70,62,66,19,70,19,70,9,16,9,19,9,51,
     37,41,43,50,9,51,9,51,15,23,24,31,15,32,9,32,
     13,27,28,32,33,34,35,36,33,36,28,37,13,38,5,10,
-    8,13,16,21,8,21,5,50,19,57,20,25,19,57,19,57,
-    20,24,19,57,19,57,9,16,15,26,27,34,15,50,15,50,
+    8,13,16,21,8,21,5,50,19,57,36,41,19,57,19,57,
+    49,53,19,57,19,57,9,16,15,26,27,34,15,50,15,50,
     38,49,15,50,15,50,9,50,12,17,5,17,114,10,0,0,
     0,99,5,0,0,0,0,0,0,0,0,0,0,0,4,0,
     0,0,3,0,0,0,115,124,0,0,0,116,0,124,0,100,
@@ -1041,12 +1041,12 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     1,2,255,22,2,8,254,115,18,0,0,0,22,19,2,3,
     10,254,12,1,16,1,6,1,2,2,22,255,32,1,115,124,
     0,0,0,8,22,23,27,28,29,30,32,28,32,23,33,8,
-    34,39,51,54,64,39,64,8,65,5,50,19,52,20,24,19,
+    34,39,51,54,64,39,64,8,65,5,50,19,52,44,48,19,
     52,19,52,9,16,9,19,9,51,37,41,43,50,9,51,9,
     51,15,26,27,34,15,50,15,50,38,49,15,50,15,50,9,
     50,9,20,28,32,9,32,5,76,9,23,24,28,29,31,32,
     34,29,34,24,35,9,36,41,52,55,65,41,65,9,66,5,
-    76,15,26,27,60,28,32,27,60,27,60,15,76,15,76,64,
+    76,15,26,27,60,52,56,27,60,27,60,15,76,15,76,64,
     75,15,76,15,76,9,76,5,76,5,76,5,76,5,76,114,
     10,0,0,0,99,4,0,0,0,0,0,0,0,0,0,0,
     0,4,0,0,0,3,0,0,0,115,42,0,0,0,124,0,
@@ -1096,7 +1096,7 @@ const unsigned char _Py_M__importlib_bootstrap_external[] = {
     0,0,16,17,2,1,8,1,4,255,2,2,6,254,4,255,
     115,14,0,0,0,14,17,2,4,2,253,8,1,4,2,2,
     255,10,1,115,42,0,0,0,8,12,13,14,15,17,13,17,
-    8,18,22,33,8,33,5,10,15,26,13,71,14,18,13,71,
+    8,18,22,33,8,33,5,10,15,26,13,71,63,67,13,71,
     13,71,15,10,15,10,15,26,15,10,15,10,9,10,5,10,
     5,10,114,10,0,0,0,99,4,0,0,0,0,0,0,0,
     0,0,0,0,5,0,0,0,3,0,0,0,115,76,0,0,