Merge remote-tracking branch 'upstream/3.13' into openssl-35_3.13

Author: zware

Doc/conf.py

@@ -462,6 +462,10 @@
 # https://github.com/sphinx-doc/sphinx/issues/12359
 epub_use_index = False
 
+# The default depth of 3 lists over a thousand entries, which makes the
+# table of contents hard to navigate in e-book readers
+epub_tocdepth = 2
+
 # translation tag
 # ---------------
 

Doc/library/turtle.rst

@@ -17,23 +17,6 @@
 
 --------------
 
-Introduction
-============
-
-Turtle graphics is an implementation of `the popular geometric drawing tools
-introduced in Logo <https://en.wikipedia.org/wiki/Turtle_
-(robot)>`_, developed by Wally Feurzeig, Seymour Papert and Cynthia Solomon
-in 1967.
-
-
-Get started
-===========
-
-Imagine a robotic turtle starting at (0, 0) in the x-y plane.  After an ``import turtle``, give it the
-command ``turtle.forward(15)``, and it moves (on-screen!) 15 pixels in the
-direction it is facing, drawing a line as it moves.  Give it the command
-``turtle.right(25)``, and it rotates in-place 25 degrees clockwise.
-
 .. sidebar:: Turtle star
 
    Turtle can draw intricate shapes using programs that repeat simple
@@ -42,21 +25,40 @@ direction it is facing, drawing a line as it moves.  Give it the command
    .. image:: turtle-star.*
       :align: center
 
-In Python, turtle graphics provides a representation of a physical "turtle"
-(a little robot with a pen) that draws on a sheet of paper on the floor.
+Imagine a robotic turtle starting at (0, 0) in the x-y plane.
+After an ``import turtle``, give it the command ``turtle.forward(15)``, and it
+moves (on-screen!) 15 pixels in the direction it is facing, drawing a line as
+it moves. Give it the command ``turtle.right(25)``, and it rotates in-place 25
+degrees clockwise.
+
+Turtle graphics is an implementation of `the drawing tools introduced in Logo
+<https://en.wikipedia.org/wiki/Turtle_(robot)>`_ in 1967. It was created as an
+educational tool, and its instant, visible feedback makes it an effective way
+for learners to encounter programming concepts. It is also a convenient way to
+produce simple graphical output without bringing in external libraries.
+
+This document includes four main sections:
 
-It's an effective and well-proven way for learners to encounter
-programming concepts and interaction with software, as it provides instant,
-visible feedback. It also provides convenient access to graphical output
-in general.
+* :ref:`turtle-tutorial` teaches the basics of turtle drawing.
+* :ref:`turtle-reference` describes the functions, methods and classes this
+  module defines.
+* :ref:`turtle-howtos` details how to handle specific tasks.
+* :ref:`turtle-explanation` provides background on the object-oriented
+  interface.
+
+.. note::
 
-Turtle drawing was originally created as an educational tool, to be used by
-teachers in the classroom. For the programmer who needs to produce some
-graphical output it can be a way to do that without the overhead of
-introducing more complex or external libraries into their work.
+   Turtle graphics requires the :mod:`tkinter` optional module.
+   The python.org installers for Windows and macOS include it, but some
+   Linux distributions and other platforms may package it separately. If
+   ``import turtle`` fails with an error mentioning ``_tkinter``, look for
+   documentation from your distributor (that is, whoever provided Python to you).
+   Check this in advance if you're planning to use turtle graphics with a learner.
 
 
 .. _turtle-tutorial:
+.. _get-started:
+.. _get-started-as-quickly-as-possible:
 
 Tutorial
 ========
@@ -99,7 +101,8 @@ Notice how the turtle, represented by an arrow, points in different
 directions as you steer it.
 
 Experiment with those commands, and also with ``backward()`` and
-``right()``.
+``right()``. Many commands also have terser aliases, such as ``fd()`` for
+:func:`forward`.
 
 
 Pen control
@@ -179,38 +182,16 @@ Finally, complete the filling::
 ``end_fill()`` command.)
 
 
+.. _turtle-howtos:
 .. _turtle-how-to:
+.. _how-to:
 
-How to...
-=========
+How-to guides
+=============
 
 This section covers some typical turtle use-cases and approaches.
 
 
-Get started as quickly as possible
-----------------------------------
-
-One of the joys of turtle graphics is the immediate, visual feedback that's
-available from simple commands - it's an excellent way to introduce children
-to programming ideas, with a minimum of overhead (not just children, of
-course).
-
-The turtle module makes this possible by exposing all its basic functionality
-as functions, available with ``from turtle import *``. The :ref:`turtle
-graphics tutorial <turtle-tutorial>` covers this approach.
-
-It's worth noting that many of the turtle commands also have even more terse
-equivalents, such as ``fd()`` for :func:`forward`. These are especially
-useful when working with learners for whom typing is not a skill.
-
-.. _note:
-
-    You'll need to have the :mod:`Tk interface package <tkinter>` installed on
-    your system for turtle graphics to work. Be warned that this is not
-    always straightforward, so check this in advance if you're planning to
-    use turtle graphics with a learner.
-
-
 Use the ``turtle`` module namespace
 -----------------------------------
 
@@ -289,8 +270,11 @@ The turtle's screen can be customised, for example::
     t.screen.bgcolor("orange")
 
 
-Turtle graphics reference
-=========================
+.. _turtle-reference:
+.. _turtle-graphics-reference:
+
+Reference
+=========
 
 .. note::
 

Doc/library/uuid.rst

@@ -44,9 +44,10 @@ which relays any information about the UUID's safety, using this enumeration:
 
 .. class:: UUID(hex=None, bytes=None, bytes_le=None, fields=None, int=None, version=None, *, is_safe=SafeUUID.unknown)
 
-   Create a UUID from either a string of 32 hexadecimal digits, a string of 16
-   bytes in big-endian order as the *bytes* argument, a string of 16 bytes in
-   little-endian order as the *bytes_le* argument, a tuple of six integers
+   Create a UUID from either a string of 32 hexadecimal digits, a 16-byte
+   :class:`bytes` object in big-endian order as the *bytes* argument, a
+   16-byte :class:`bytes` object in little-endian order as the *bytes_le*
+   argument, a tuple of six integers
    (32-bit *time_low*, 16-bit *time_mid*, 16-bit *time_hi_version*,
    8-bit *clock_seq_hi_variant*, 8-bit *clock_seq_low*, 48-bit *node*) as the
    *fields* argument, or a single 128-bit integer as the *int* argument.
@@ -80,14 +81,14 @@ which relays any information about the UUID's safety, using this enumeration:
 
 .. attribute:: UUID.bytes
 
-   The UUID as a 16-byte string (containing the six integer fields in big-endian
-   byte order).
+   The UUID as a 16-byte :class:`bytes` object (containing the six integer
+   fields in big-endian byte order).
 
 
 .. attribute:: UUID.bytes_le
 
-   The UUID as a 16-byte string (with *time_low*, *time_mid*, and *time_hi_version*
-   in little-endian byte order).
+   The UUID as a 16-byte :class:`bytes` object (with *time_low*, *time_mid*,
+   and *time_hi_version* in little-endian byte order).
 
 
 .. attribute:: UUID.fields
@@ -340,7 +341,7 @@ Here are some examples of typical usage of the :mod:`uuid` module::
    >>> x.bytes
    b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f'
 
-   >>> # make a UUID from a 16-byte string
+   >>> # make a UUID from a 16-byte bytes object
    >>> uuid.UUID(bytes=x.bytes)
    UUID('00010203-0405-0607-0809-0a0b0c0d0e0f')
 

Grammar/python.gram

@@ -748,6 +748,7 @@ compare_op_bitwise_or_pair[CmpopExprPair*]:
     | eq_bitwise_or
     | noteq_bitwise_or
     | lte_bitwise_or
+    | invalid_noteq
     | lt_bitwise_or
     | gte_bitwise_or
     | gt_bitwise_or
@@ -1439,3 +1440,10 @@ invalid_type_params:
         RAISE_SYNTAX_ERROR_STARTING_FROM(
             token,
             "Type parameter list cannot be empty")}
+
+invalid_noteq:
+    | a='<' b='>' {
+        _PyPegen_tokens_are_adjacent(a, b)
+        ? RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax.  Maybe you meant '!=' instead of '<>'?")
+        : NULL
+    }

Lib/_pyrepl/unix_console.py

@@ -363,6 +363,7 @@ def prepare(self):
         raw.cc[termios.VMIN] = 1
         raw.cc[termios.VTIME] = 0
         self.__input_fd_set(raw)
+        self.__rawtermstate = raw
 
         # In macOS terminal we need to deactivate line wrap via ANSI escape code
         if self.is_apple_terminal:
@@ -599,7 +600,20 @@ def input_hook(self):
         except ImportError:
             return None
         if posix._is_inputhook_installed():
-            return posix._inputhook
+            return self.__run_input_hook
+
+    def __run_input_hook(self):
+        import posix
+        # gh-152907: input hooks expect cooked output, but pyrepl runs with
+        # OPOST disabled.  Restore the saved output flags around the hook
+        # (only oflag; input must stay raw at the prompt).
+        cooked = self.__rawtermstate.copy()
+        cooked.oflag = self.__svtermstate.oflag
+        self.__input_fd_set(cooked)
+        try:
+            return posix._inputhook()
+        finally:
+            self.__input_fd_set(self.__rawtermstate)
 
     def __enable_bracketed_paste(self) -> None:
         os.write(self.output_fd, b"\x1b[?2004h")

Lib/idlelib/idle_test/test_outwin.py

@@ -46,7 +46,11 @@ def test_save_defaults_to_text(self):
         io = self.window.io
         self.assertEqual(io.defaultextension, '.txt')
         # Text files are offered before Python files.
-        self.assertEqual(io.filetypes[0][0], 'Text files')
+        self.assertEqual(io.save_filetypes[0][0], 'Text files')
+
+    def test_open_defaults_to_python(self):
+        # gh-158067: File Open still lists Python files first.
+        self.assertEqual(self.window.io.filetypes[0][0], 'Python files')
 
     def test_window_title(self):
         self.assertEqual(self.window.top.title(), 'Output' + ' (%s)' % platform.python_version())

Lib/idlelib/iomenu.py

@@ -386,8 +386,10 @@ def print_window(self, event):
         ("All files", "*"),
         )
 
-    # Output windows (Shell, Output) are not Python source, so they list
-    # text files first and default to ".txt" (gh-65339).
+    save_filetypes = filetypes
+
+    # Output windows (Shell, Output) are not Python source, so they save
+    # with text files listed first and default to ".txt" (gh-65339).
     text_filetypes = (
         ("Text files", "*.txt", "TEXT"),
         ("Python files", py_extensions, "TEXT"),
@@ -427,7 +429,7 @@ def asksavefile(self):
         if not self.savedialog:
             self.savedialog = filedialog.SaveAs(
                     parent=self.text,
-                    filetypes=self.filetypes,
+                    filetypes=self.save_filetypes,
                     defaultextension=self.defaultextension)
         filename = self.savedialog.show(initialdir=dir, initialfile=base)
         return filename

Lib/idlelib/outwin.py

@@ -80,7 +80,7 @@ def __init__(self, *args):
         self.text.bind("<<goto-file-line>>", self.goto_file_line)
         # Output is not Python source, so save it as text by default
         # (gh-65339).
-        self.io.filetypes = self.io.text_filetypes
+        self.io.save_filetypes = self.io.text_filetypes
         self.io.defaultextension = self.io.text_defaultextension
 
     # Customize EditorWindow

Lib/idlelib/run.py

@@ -164,6 +164,7 @@ def main(del_exitfunc=False):
                     ).start()
 
     while True:
+        request = None
         try:
             if exit_now:
                 try:
@@ -174,9 +175,9 @@ def main(del_exitfunc=False):
             try:
                 request = rpc.request_queue.get(block=True, timeout=0.05)
             except queue.Empty:
-                request = None
                 # Issue 32207: calling handle_tk_events here adds spurious
                 # queue.Empty traceback to event handling exceptions.
+                pass
             if request:
                 seq, (method, args, kwargs) = request
                 ret = method(*args, **kwargs)
@@ -186,6 +187,10 @@ def main(del_exitfunc=False):
         except KeyboardInterrupt:
             if quitting:
                 exit_now = True
+            elif request:
+                # Interrupted while executing a request, as when debugging.
+                print_exception()
+                rpc.response_queue.put((seq, None))
             continue
         except SystemExit:
             capture_warnings(False)

Lib/idlelib/sidebar.py

@@ -453,7 +453,7 @@ def mkcmd(eventname):
         return "break"
 
     def grid(self):
-        self.canvas.grid(row=1, column=0, sticky=tk.NSEW, padx=2, pady=0)
+        self.canvas.grid(row=1, column=0, sticky=tk.NSEW)
 
     def change_callback(self):
         if self.is_shown: