simplify things and add test

pablogsal · pablogsal · commit 3f86aa3a22a5 · 2025-01-22T15:58:12.000Z
diff --git a/Lib/test/test_fstring.py b/Lib/test/test_fstring.py
@@ -1649,6 +1649,14 @@ def __repr__(self):
         #self.assertEqual(f'X{x =}Y', 'Xx\t='+repr(x)+'Y')
         #self.assertEqual(f'X{x =       }Y', 'Xx\t=\t'+repr(x)+'Y')
 
+    def test_debug_expressions_are_raw_strings(self):
+
+        self.assertEqual(f'{b"\N{OX}"=}', 'b"\\N{OX}"=b\'\\\\N{OX}\'')
+        self.assertEqual(f'{r"\xff"=}', 'r"\\xff"=\'\\\\xff\'')
+        self.assertEqual(f'{r"\n"=}', 'r"\\n"=\'\\\\n\'')
+        self.assertEqual(f"{'\''=}", "'\\''=\"'\"")
+        self.assertEqual(f'{'\xc5'=}', r"'\xc5'='Å'")
+
     def test_walrus(self):
         x = 20
         # This isn't an assignment expression, it's 'x', with a format
diff --git a/Parser/action_helpers.c b/Parser/action_helpers.c
@@ -1248,6 +1248,7 @@ _PyPegen_nonparen_genexp_in_call(Parser *p, expr_ty args, asdl_comprehension_seq
 
 static expr_ty
 _PyPegen_decode_fstring_part(Parser* p, int is_raw, expr_ty constant, Token* token) {
+
     assert(PyUnicode_CheckExact(constant->v.Constant.value));
     const char* bstr = PyUnicode_AsUTF8(constant->v.Constant.value);
     if (bstr == NULL) {
diff --git a/Parser/lexer/lexer.c b/Parser/lexer/lexer.c
@@ -153,13 +153,13 @@ set_fstring_expr(struct tok_state* tok, struct token *token, char c) {
         }
 
         result[j] = '\0';  // Null-terminate the result string
-        res = PyUnicode_DecodeUTF8Stateful(result, j, NULL, NULL);
+        res = PyUnicode_DecodeUTF8(result, j, NULL);
         PyMem_Free(result);
     } else {
-        res = PyUnicode_DecodeUTF8Stateful(
+        res = PyUnicode_DecodeUTF8(
             tok_mode->last_expr_buffer,
             tok_mode->last_expr_size - tok_mode->last_expr_end,
-            NULL, NULL
+            NULL
         );
 
     }
