mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-23 02:04:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.12] gh-129093: Fix f-string debug text sometimes getting cut off when expression contains ! (#129164)

Browse source
This commit is contained in:
Pablo Galindo Salgado 2025-01-22 00:47:20 +00:00 • committed by GitHub
parent b849a1b751
commit e577ff4ce4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_fstring.py
View file

@ -1875,6 +1875,24 @@ print(f'''{{
self.assertIn(rb"\1", stdout)
self.assertEqual(len(stderr.strip().splitlines()), 2)
def test_gh129093(self):
self.assertEqual(f'{1==2=}', '1==2=False')
self.assertEqual(f'{1 == 2=}', '1 == 2=False')
self.assertEqual(f'{1!=2=}', '1!=2=True')
self.assertEqual(f'{1 != 2=}', '1 != 2=True')
self.assertEqual(f'{(1) != 2=}', '(1) != 2=True')
self.assertEqual(f'{(1*2) != (3)=}', '(1*2) != (3)=True')
self.assertEqual(f'{1 != 2 == 3 != 4=}', '1 != 2 == 3 != 4=False')
self.assertEqual(f'{1 == 2 != 3 == 4=}', '1 == 2 != 3 == 4=False')
self.assertEqual(f'{f'{1==2=}'=}', "f'{1==2=}'='1==2=False'")
self.assertEqual(f'{f'{1 == 2=}'=}', "f'{1 == 2=}'='1 == 2=False'")
self.assertEqual(f'{f'{1!=2=}'=}', "f'{1!=2=}'='1!=2=True'")
self.assertEqual(f'{f'{1 != 2=}'=}', "f'{1 != 2=}'='1 != 2=True'")
if __name__ == "__main__":
unittest.main()

2
Misc/NEWS.d/next/Core_and_Builtins/2025-01-21-23-35-41.gh-issue-129093.0rvETC.rst Normal file
View file

@ -0,0 +1,2 @@
Fix f-strings such as ``f'{expr=}'`` sometimes not displaying the full
expression when the expression contains ``!=``.

4
Parser/tokenizer.c
View file

@ -480,9 +480,7 @@ static int update_fstring_expr(struct tok_state *tok, char cur) {
case '}':
case '!':
case ':':
if (tok_mode->last_expr_end == -1) {
tok_mode->last_expr_end = strlen(tok->start);
}
tok_mode->last_expr_end = strlen(tok->start);
break;
default:
Py_UNREACHABLE();