Merge branch '3.13' into backport-a931a8b-3.13

Author: pablogsal

Grammar/python.gram

@@ -207,7 +207,7 @@ import_name[stmt_ty]: 'import' a=dotted_as_names { _PyAST_Import(a, EXTRA) }
 # note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
 import_from[stmt_ty]:
     | 'from' a=('.' | '...')* b=dotted_name 'import' c=import_from_targets {
-        _PyAST_ImportFrom(b->v.Name.id, c, _PyPegen_seq_count_dots(a), EXTRA) }
+        _PyPegen_checked_future_import(p, b->v.Name.id, c, _PyPegen_seq_count_dots(a), EXTRA) }
     | 'from' a=('.' | '...')+ 'import' b=import_from_targets {
         _PyAST_ImportFrom(NULL, b, _PyPegen_seq_count_dots(a), EXTRA) }
 import_from_targets[asdl_alias_seq*]:

Lib/_pyrepl/reader.py

@@ -62,7 +62,7 @@ def disp_str(buffer: str) -> tuple[str, list[int]]:
         elif unicodedata.category(c).startswith("C"):
             c = r"\u%04x" % ord(c)
             s.append(c)
-            b.extend([0] * (len(c) - 1))
+            b.append(len(c))
         else:
             s.append(c)
             b.append(str_width(c))
@@ -577,6 +577,7 @@ def setpos_from_xy(self, x: int, y: int) -> None:
         cur_x = self.screeninfo[i][0]
         while cur_x < x:
             if self.screeninfo[i][1][j] == 0:
+                j += 1  # prevent potential future infinite loop
                 continue
             cur_x += self.screeninfo[i][1][j]
             j += 1

Lib/test/test_flufl.py

@@ -34,6 +34,32 @@ def test_guido_as_bdfl(self):
         # parser reports the start of the token
         self.assertEqual(cm.exception.offset, 3)
 
+    def test_barry_as_bdfl_look_ma_with_no_compiler_flags(self):
+        # Check that the future import is handled by the parser
+        # even if the compiler flags are not passed.
+        code = "from __future__ import barry_as_FLUFL;2 {0} 3"
+        compile(code.format('<>'), '<BDFL test>', 'exec')
+        with self.assertRaises(SyntaxError) as cm:
+            compile(code.format('!='), '<FLUFL test>', 'exec')
+        self.assertRegex(str(cm.exception), "with Barry as BDFL, use '<>' instead of '!='")
+        self.assertIn('2 != 3', cm.exception.text)
+        self.assertEqual(cm.exception.filename, '<FLUFL test>')
+        self.assertEqual(cm.exception.lineno, 1)
+        self.assertEqual(cm.exception.offset, len(code) - 4)
+
+    def test_barry_as_bdfl_relative_import(self):
+        code = "from .__future__ import barry_as_FLUFL;2 {0} 3"
+        compile(code.format('!='), '<FLUFL test>', 'exec')
+        with self.assertRaises(SyntaxError) as cm:
+            compile(code.format('<>'), '<BDFL test>', 'exec')
+        self.assertRegex(str(cm.exception), "<BDFL test>")
+        self.assertIn('2 <> 3', cm.exception.text)
+        self.assertEqual(cm.exception.filename, '<BDFL test>')
+        self.assertEqual(cm.exception.lineno, 1)
+        self.assertEqual(cm.exception.offset, len(code) - 4)
+
+
+
 
 if __name__ == '__main__':
     unittest.main()

Lib/test/test_pyrepl/test_reader.py

@@ -319,3 +319,11 @@ def test_pos2xy_with_no_columns(self):
         # Simulate a resize to 0 columns
         reader.screeninfo = []
         self.assertEqual(reader.pos2xy(), (0, 0))
+
+    def test_setpos_from_xy_for_non_printing_char(self):
+        code = "# non \u200c printing character"
+        events = code_to_events(code)
+
+        reader, _ = handle_all_events(events)
+        reader.setpos_from_xy(8, 0)
+        self.assertEqual(reader.pos, 7)

Misc/ACKS

@@ -277,6 +277,7 @@ Laurent De Buyst
 Zach Byrne
 Vedran Čačić
 Nicolas Cadou
+Zhikai Cai
 Jp Calderone
 Ben Caller
 Arnaud Calmettes

Misc/NEWS.d/next/Core_and_Builtins/2024-10-29-23-30-35.gh-issue-125331.quKQ7V.rst

@@ -0,0 +1,5 @@
+``from __future__ import barry_as_FLUFL`` now works in more contexts,
+including when it is used in files, with the ``-c`` flag, and in the REPL
+when there are multiple statements on the same line. Previously, it worked
+only on subsequent lines in the REPL, and when the appropriate flags were
+passed directly to :func:`compile`. Patch by Pablo Galindo.

Misc/NEWS.d/next/Library/2024-10-05-13-25-07.gh-issue-124927.uzNA32.rst

@@ -0,0 +1 @@
+Non-printing characters are now properly handled in the new REPL.

Parser/action_helpers.c

@@ -1685,3 +1685,18 @@ _PyPegen_concatenate_strings(Parser *p, asdl_expr_seq *strings,
     assert(current_pos == n_elements);
     return _PyAST_JoinedStr(values, lineno, col_offset, end_lineno, end_col_offset, p->arena);
 }
+
+stmt_ty
+_PyPegen_checked_future_import(Parser *p, identifier module, asdl_alias_seq * names, int level,
+                  			   int lineno, int col_offset, int end_lineno, int end_col_offset,
+                      		   PyArena *arena) {
+    if (level == 0 && PyUnicode_CompareWithASCIIString(module, "__future__") == 0) {
+        for (Py_ssize_t i = 0; i < asdl_seq_LEN(names); i++) {
+            alias_ty alias = asdl_seq_GET(names, i);
+            if (PyUnicode_CompareWithASCIIString(alias->name, "barry_as_FLUFL") == 0) {
+                p->flags |= PyPARSE_BARRY_AS_BDFL;
+            }
+        }
+    }
+    return _PyAST_ImportFrom(module, names, level, lineno, col_offset, end_lineno, end_col_offset, arena);
+}

Parser/parser.c

@@ -346,6 +346,8 @@ mod_ty _PyPegen_make_module(Parser *, asdl_stmt_seq *);
 void *_PyPegen_arguments_parsing_error(Parser *, expr_ty);
 expr_ty _PyPegen_get_last_comprehension_item(comprehension_ty comprehension);
 void *_PyPegen_nonparen_genexp_in_call(Parser *p, expr_ty args, asdl_comprehension_seq *comprehensions);
+stmt_ty _PyPegen_checked_future_import(Parser *p, identifier module, asdl_alias_seq *,
+                                       int , int, int , int , int , PyArena *);
 
 // Parser API