remove empty fstring middle tokens from test

tusharsadhwani · Dec 23, 2024 · 51e7ce1 · 51e7ce1
1 parent b3500c4
commit 51e7ce1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/tests/data/miscellaneous/debug_visitor.out b/tests/data/miscellaneous/debug_visitor.out
@@ -232,8 +232,6 @@ file_input
                         fstring
                           FSTRING_START
  "f'"
-                          FSTRING_MIDDLE
- ''
                           fstring_replacement_field
                             LBRACE
  '{'
@@ -242,8 +240,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           fstring_replacement_field
                             LBRACE
  '{'
@@ -252,8 +248,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           FSTRING_END
  "'"
                         /fstring
@@ -399,8 +393,6 @@ file_input
                         fstring
                           FSTRING_START
  "f'"
-                          FSTRING_MIDDLE
- ''
                           fstring_replacement_field
                             LBRACE
  '{'
@@ -419,8 +411,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           FSTRING_END
  "'"
                         /fstring
@@ -549,8 +539,6 @@ file_input
                         fstring
                           FSTRING_START
  "f'"
-                          FSTRING_MIDDLE
- ''
                           fstring_replacement_field
                             LBRACE
  '{'
@@ -559,8 +547,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           fstring_replacement_field
                             LBRACE
  '{'
@@ -569,8 +555,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           FSTRING_END
  "'"
                         /fstring
@@ -660,8 +644,6 @@ file_input
                                 RBRACE
  '}'
                               /fstring_replacement_field
-                              FSTRING_MIDDLE
- ''
                               FSTRING_END
  "'"
                             /fstring
@@ -744,8 +726,6 @@ file_input
                             RBRACE
  '}'
                           /fstring_replacement_field
-                          FSTRING_MIDDLE
- ''
                           FSTRING_END
  "'"
                         /fstring

diff --git a/tests/test_tokenize.py b/tests/test_tokenize.py
@@ -63,11 +63,9 @@ def test_fstring() -> None:
         'f"{x}"',
         [
             Token("FSTRING_START", 'f"', (1, 0), (1, 2)),
-            Token("FSTRING_MIDDLE", "", (1, 2), (1, 2)),
             Token("OP", "{", (1, 2), (1, 3)),
             Token("NAME", "x", (1, 3), (1, 4)),
             Token("OP", "}", (1, 4), (1, 5)),
-            Token("FSTRING_MIDDLE", "", (1, 5), (1, 5)),
             Token("FSTRING_END", '"', (1, 5), (1, 6)),
             Token("ENDMARKER", "", (2, 0), (2, 0)),
         ],
@@ -76,13 +74,11 @@ def test_fstring() -> None:
         'f"{x:y}"\n',
         [
             Token(type="FSTRING_START", string='f"', start=(1, 0), end=(1, 2)),
-            Token(type="FSTRING_MIDDLE", string="", start=(1, 2), end=(1, 2)),
-            Token(type="LBRACE", string="{", start=(1, 2), end=(1, 3)),
+            Token(type="OP", string="{", start=(1, 2), end=(1, 3)),
             Token(type="NAME", string="x", start=(1, 3), end=(1, 4)),
             Token(type="OP", string=":", start=(1, 4), end=(1, 5)),
             Token(type="FSTRING_MIDDLE", string="y", start=(1, 5), end=(1, 6)),
-            Token(type="RBRACE", string="}", start=(1, 6), end=(1, 7)),
-            Token(type="FSTRING_MIDDLE", string="", start=(1, 7), end=(1, 7)),
+            Token(type="OP", string="}", start=(1, 6), end=(1, 7)),
             Token(type="FSTRING_END", string='"', start=(1, 7), end=(1, 8)),
             Token(type="NEWLINE", string="\n", start=(1, 8), end=(1, 9)),
             Token(type="ENDMARKER", string="", start=(2, 0), end=(2, 0)),
@@ -93,10 +89,9 @@ def test_fstring() -> None:
         [
             Token(type="FSTRING_START", string='f"', start=(1, 0), end=(1, 2)),
             Token(type="FSTRING_MIDDLE", string="x\\\n", start=(1, 2), end=(2, 0)),
-            Token(type="LBRACE", string="{", start=(2, 0), end=(2, 1)),
+            Token(type="OP", string="{", start=(2, 0), end=(2, 1)),
             Token(type="NAME", string="a", start=(2, 1), end=(2, 2)),
-            Token(type="RBRACE", string="}", start=(2, 2), end=(2, 3)),
-            Token(type="FSTRING_MIDDLE", string="", start=(2, 3), end=(2, 3)),
+            Token(type="OP", string="}", start=(2, 2), end=(2, 3)),
             Token(type="FSTRING_END", string='"', start=(2, 3), end=(2, 4)),
             Token(type="NEWLINE", string="\n", start=(2, 4), end=(2, 5)),
             Token(type="ENDMARKER", string="", start=(3, 0), end=(3, 0)),