Merge branch 'main' into tier-2-tos-caching

Author: markshannon

.github/workflows/tail-call.yml

@@ -114,8 +114,8 @@ jobs:
           find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
           brew install llvm@${{ matrix.llvm }}
           export SDKROOT="$(xcrun --show-sdk-path)"
-          export PATH="/usr/local/opt/llvm/bin:$PATH"
-          export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+          export PATH="/usr/local/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
+          export PATH="/opt/homebrew/opt/llvm@${{ matrix.llvm }}/bin:$PATH"
           CC=clang-20 ./configure --with-tail-call-interp
           make all --jobs 4
           ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

.gitignore

@@ -80,7 +80,6 @@ iOS/testbed/Python.xcframework/ios-*/lib
 iOS/testbed/Python.xcframework/ios-*/Python.framework
 iOS/testbed/iOSTestbed.xcodeproj/project.xcworkspace
 iOS/testbed/iOSTestbed.xcodeproj/xcuserdata
-iOS/testbed/iOSTestbed.xcodeproj/xcshareddata
 Mac/Makefile
 Mac/PythonLauncher/Info.plist
 Mac/PythonLauncher/Makefile

Doc/library/curses.rst

@@ -770,7 +770,7 @@ the following methods and attributes:
 
 .. method:: window.attron(attr)
 
-   Add attribute *attr* from the "background" set applied to all writes to the
+   Add attribute *attr* to the "background" set applied to all writes to the
    current window.
 
 

Doc/library/imaplib.rst

@@ -413,6 +413,9 @@ An :class:`IMAP4` instance has the following methods:
    the password.  Will only work if the server ``CAPABILITY`` response includes the
    phrase ``AUTH=CRAM-MD5``.
 
+   .. versionchanged:: next
+      An :exc:`IMAP4.error` is raised if MD5 support is not available.
+
 
 .. method:: IMAP4.logout()
 

Doc/library/sys.rst

@@ -1764,7 +1764,7 @@ always available. Unless explicitly noted otherwise, all variables are read-only
    :func:`settrace` for each thread being debugged or use :func:`threading.settrace`.
 
    Trace functions should have three arguments: *frame*, *event*, and
-   *arg*. *frame* is the current stack frame.  *event* is a string: ``'call'``,
+   *arg*. *frame* is the :ref:`current stack frame <frame-objects>`. *event* is a string: ``'call'``,
    ``'line'``, ``'return'``, ``'exception'`` or ``'opcode'``.  *arg* depends on
    the event type.
 

Doc/reference/simple_stmts.rst

@@ -971,10 +971,17 @@ as globals. It would be impossible to assign to a global variable without
 :keyword:`!global`, although free variables may refer to globals without being
 declared global.
 
-The :keyword:`global` statement applies to the entire scope of a function or
-class body. A :exc:`SyntaxError` is raised if a variable is used or
+The :keyword:`!global` statement applies to the entire current scope
+(module, function body or class definition).
+A :exc:`SyntaxError` is raised if a variable is used or
 assigned to prior to its global declaration in the scope.
 
+At the module level, all variables are global, so a :keyword:`!global`
+statement has no effect.
+However, variables must still not be used or
+assigned to prior to their :keyword:`!global` declaration.
+This requirement is relaxed in the interactive prompt (:term:`REPL`).
+
 .. index::
    pair: built-in function; exec
    pair: built-in function; eval

Doc/tutorial/classes.rst

@@ -359,7 +359,7 @@ Usually, a method is called right after it is bound::
 
    x.f()
 
-In the :class:`!MyClass` example, this will return the string ``'hello world'``.
+If ``x = MyClass()``, as above, this will return the string ``'hello world'``.
 However, it is not necessary to call a method right away: ``x.f`` is a method
 object, and can be stored away and called at a later time.  For example::
 

Doc/using/ios.rst

@@ -374,6 +374,17 @@ You can also open the testbed project in Xcode by running:
 
 This will allow you to use the full Xcode suite of tools for debugging.
 
+The arguments used to run the test suite are defined as part of the test plan.
+To modify the test plan, select the test plan node of the project tree (it
+should be the first child of the root node), and select the "Configurations"
+tab. Modify the "Arguments Passed On Launch" value to change the testing
+arguments.
+
+The test plan also disables parallel testing, and specifies the use of the
+``iOSTestbed.lldbinit`` file for providing configuration of the debugger. The
+default debugger configuration disables automatic breakpoints on the
+``SIGINT``, ``SIGUSR1``, ``SIGUSR2``, and ``SIGXFSZ`` signals.
+
 App Store Compliance
 ====================
 

Doc/whatsnew/3.14.rst

@@ -65,7 +65,7 @@ Summary -- release highlights
 .. This section singles out the most important changes in Python 3.14.
    Brevity is key.
 
-Python 3.14 beta is the pre-release of the next version of the Python
+Python 3.14 will be the latest stable release of the Python
 programming language, with a mix of changes to the language, the
 implementation and the standard library.
 
@@ -635,7 +635,7 @@ Improved error messages
   misspellings may still result in regular syntax errors.
   (Contributed by Pablo Galindo in :gh:`132449`.)
 
-* When unpacking assignment fails due to incorrect number of variables, the
+* When an unpacking assignment fails due to an incorrect number of variables, the
   error message prints the received number of values in more cases than before.
   (Contributed by Tushar Sadhwani in :gh:`122239`.)
 
@@ -763,7 +763,7 @@ ABI-compatible changes in the future.
 
 Complete the :pep:`587` :ref:`PyConfig C API <pyconfig_api>` by adding
 :c:func:`PyInitConfig_AddModule` which can be used to add a built-in extension
-module; feature previously referred to as the “inittab”.
+module; a feature previously referred to as the “inittab”.
 
 Add :c:func:`PyConfig_Get` and :c:func:`PyConfig_Set` functions to get and set
 the current runtime configuration.
@@ -1051,7 +1051,7 @@ Concurrent safe warnings control
 The :class:`warnings.catch_warnings` context manager will now optionally
 use a context variable for warning filters.  This is enabled by setting
 the :data:`~sys.flags.context_aware_warnings` flag, either with the ``-X``
-command-line option or an environment variable.  This gives predicable
+command-line option or an environment variable.  This gives predictable
 warnings control when using :class:`~warnings.catch_warnings` combined with
 multiple threads or asynchronous tasks. The flag defaults to true for the
 free-threaded build and false for the GIL-enabled build.
@@ -1152,7 +1152,7 @@ Other language changes
   unlike ``\Z``, which has subtly different behavior.
   (Contributed by Serhiy Storchaka in :gh:`133306`.)
 
-* ``\B`` in :mod:`regular expression <re>` now matches empty input string.
+* ``\B`` in :mod:`regular expression <re>` now matches the empty input string.
   Now it is always the opposite of ``\b``.
   (Contributed by Serhiy Storchaka in :gh:`124130`.)
 
@@ -1221,7 +1221,7 @@ PEP 765: Disallow ``return``/``break``/``continue`` that exit a ``finally`` bloc
 ---------------------------------------------------------------------------------
 
 The compiler emits a :exc:`SyntaxWarning` when a :keyword:`return`, :keyword:`break` or
-:keyword:`continue` statements appears where it exits a :keyword:`finally` block.
+:keyword:`continue` statement appears where it exits a :keyword:`finally` block.
 This change is specified in :pep:`765`.
 
 
@@ -1278,7 +1278,7 @@ ast
   (Contributed by Irit Katriel in :gh:`130139`.)
 
 * Add new ``--feature-version``, ``--optimize``, ``--show-empty`` options to
-  command-line interface.
+  the command-line interface.
   (Contributed by Semyon Moroz in :gh:`133367`.)
 
 
@@ -2157,7 +2157,7 @@ unittest
     :meth:`~unittest.TestCase.assertNotStartsWith`,
     :meth:`~unittest.TestCase.assertEndsWith` and
     :meth:`~unittest.TestCase.assertNotEndsWith` check whether the Unicode
-    or byte string starts or ends with particular string(s).
+    or byte string starts or ends with particular strings.
 
   (Contributed by Serhiy Storchaka in :gh:`71339`.)
 
@@ -2223,15 +2223,15 @@ webbrowser
   supported browsers on macOS.
 
 
-zipinfo
+zipfile
 -------
 
 * Added :func:`ZipInfo._for_archive <zipfile.ZipInfo._for_archive>`
   to resolve suitable defaults for a :class:`~zipfile.ZipInfo` object
   as used by :func:`ZipFile.writestr <zipfile.ZipFile.writestr>`.
   (Contributed by Bénédikt Tran in :gh:`123424`.)
 
-* :meth:`zipfile.ZipFile.writestr` now respect ``SOURCE_DATE_EPOCH`` that
+* :meth:`zipfile.ZipFile.writestr` now respects ``SOURCE_DATE_EPOCH`` that
   distributions can set centrally and have build tools consume this in order
   to produce reproducible output.
   (Contributed by Jiahao Li in :gh:`91279`.)
@@ -2379,7 +2379,7 @@ zlib
 * On Windows, `zlib-ng <https://github.com/zlib-ng/zlib-ng>`__
   is now used as the implementation of the :mod:`zlib` module
   in the default binaries.
-  There are no known incompatabilities between ``zlib-ng``
+  There are no known incompatibilities between ``zlib-ng``
   and the previously-used ``zlib`` implementation.
   This should result in better performance at all compression levels.
 
@@ -2839,7 +2839,7 @@ Changes in the Python API
     rather than collecting generation 1.
   * Other calls to :func:`!gc.collect` are unchanged.
 
-* The :func:`locale.nl_langinfo` function now sets temporarily the ``LC_CTYPE``
+* The :func:`locale.nl_langinfo` function now temporarily sets the ``LC_CTYPE``
   locale in some cases.
   This temporary change affects other threads.
   (Contributed by Serhiy Storchaka in :gh:`69998`.)
@@ -3019,8 +3019,8 @@ New features
   and get an attribute of the module.
   (Contributed by Victor Stinner in :gh:`128911`.)
 
-* Add support for a new ``p`` format unit in :c:func:`Py_BuildValue` that allows to
-  take a C integer and produce a Python :class:`bool` object. (Contributed by
+* Add support for a new ``p`` format unit in :c:func:`Py_BuildValue` that allows
+  taking a C integer and produces a Python :class:`bool` object. (Contributed by
   Pablo Galindo in :issue:`45325`.)
 
 * Add :c:func:`PyUnstable_Object_IsUniqueReferencedTemporary` to determine if an object

Doc/whatsnew/3.15.rst

@@ -169,6 +169,45 @@ production systems where traditional profiling approaches would be too intrusive
 (Contributed by Pablo Galindo and László Kiss Kollár in :gh:`135953`.)
 
 
+Improved error messages
+-----------------------
+
+* The interpreter now provides more helpful suggestions in :exc:`AttributeError`
+  exceptions when accessing an attribute on an object that does not exist, but
+  a similar attribute is available through one of its members.
+
+  For example, if the object has an attribute that itself exposes the requested
+  name, the error message will suggest accessing it via that inner attribute:
+
+  .. code-block:: python
+
+     @dataclass
+     class Circle:
+        radius: float
+
+        @property
+        def area(self) -> float:
+           return pi * self.radius**2
+
+     class Container:
+        def __init__(self, inner: Circle) -> None:
+           self.inner = inner
+
+     circle = Circle(radius=4.0)
+     container = Container(circle)
+     print(container.area)
+
+  Running this code now produces a clearer suggestion:
+
+  .. code-block:: pycon
+
+     Traceback (most recent call last):
+     File "/home/pablogsal/github/python/main/lel.py", line 42, in <module>
+        print(container.area)
+              ^^^^^^^^^^^^^^
+     AttributeError: 'Container' object has no attribute 'area'. Did you mean: 'inner.area'?
+
+
 Other language changes
 ======================
 
@@ -200,6 +239,25 @@ Other language changes
 * Several error messages incorrectly using the term "argument" have been corrected.
   (Contributed by Stan Ulbrych in :gh:`133382`.)
 
+* The interpreter now tries to provide a suggestion when
+  :func:`delattr` fails due to a missing attribute.
+  When an attribute name that closely resembles an existing attribute is used,
+  the interpreter will suggest the correct attribute name in the error message.
+  For example:
+
+  .. doctest::
+
+     >>> class A:
+     ...     pass
+     >>> a = A()
+     >>> a.abcde = 1
+     >>> del a.abcdf  # doctest: +ELLIPSIS
+     Traceback (most recent call last):
+     ...
+     AttributeError: 'A' object has no attribute 'abcdf'. Did you mean: 'abcde'?
+
+  (Contributed by Nikita Sobolev and Pranjal Prajapati in :gh:`136588`.)
+
 * Unraisable exceptions are now highlighted with color by default. This can be
   controlled by :ref:`environment variables <using-on-controlling-color>`.
   (Contributed by Peter Bierma in :gh:`134170`.)