Merge branch 'main' into complex-abs-errno/155526

Author: skirpichev

Doc/howto/logging-cookbook.rst

@@ -3920,7 +3920,7 @@ subclassed handler which looks something like this::
 
 You'll need to be familiar with RFC 5424 to fully understand the above code, and it
 may be that you have slightly different needs (e.g. for how you pass structural data
-to the log). Nevertheless, the above should be adaptable to your speciric needs. With
+to the log). Nevertheless, the above should be adaptable to your specific needs. With
 the above handler, you'd pass structured data using something like this::
 
     sd = {

Doc/howto/mro.rst

@@ -189,7 +189,7 @@ prescription:
   the tail of any of the other lists, then add it to the linearization
   of C and remove it from the lists in the merge, otherwise look at the
   head of the next list and take it, if it is a good head.  Then repeat
-  the operation until all the class are removed or it is impossible to
+  the operation until all the classes are removed or it is impossible to
   find good heads.  In this case, it is impossible to construct the
   merge, Python 2.3 will refuse to create the class C and will raise an
   exception.*

Doc/library/curses.rst

@@ -326,9 +326,10 @@ Input options
 
    The curses library does "line-breakout optimization" by looking for typeahead
    periodically while updating the screen.  If input is found, and it is coming
-   from a tty, the current update is postponed until refresh or doupdate is called
-   again, allowing faster response to commands typed in advance. This function
-   allows specifying a different file descriptor for typeahead checking.
+   from a tty, the current update is postponed until :meth:`~window.refresh` or
+   :func:`doupdate` is called again, allowing faster response to commands typed
+   in advance. This function allows specifying a different file descriptor for
+   typeahead checking.
 
 .. function:: is_cbreak()
 
@@ -702,7 +703,8 @@ labels.
    (eight labels).  Where the underlying curses library supports them, ``2``
    gives 4-4-4 (twelve labels) and ``3`` gives 4-4-4 with an index line.
 
-   Must be called before :func:`initscr` or :func:`newterm`.
+   Must be called before :func:`initscr` or :func:`newterm`,
+   and affects only the screen created next.
 
    .. versionadded:: next
 
@@ -1067,8 +1069,10 @@ Utilities
 
 .. function:: filter()
 
-   The :func:`.filter` routine, if used, must be called before :func:`initscr` is
-   called.  The effect is that, during the initialization, :envvar:`LINES` is set to ``1``; the
+   The :func:`.filter` routine, if used, must be called before :func:`initscr`
+   or :func:`newterm` is called,
+   and affects every screen created afterwards.
+   The effect is that, during the initialization, :envvar:`LINES` is set to ``1``; the
    capabilities ``clear``, ``cup``, ``cud``, ``cud1``, ``cuu1``, ``cuu``, ``vpa`` are disabled; and the ``home``
    string is set to the value of ``cr``. The effect is that the cursor is confined to
    the current line, and so are screen updates.  This may be used for enabling
@@ -1087,8 +1091,10 @@ Utilities
 
 .. function:: use_env(flag)
 
-   If used, this function should be called before :func:`initscr` or newterm are
-   called.  When *flag* is ``False``, the values of lines and columns specified in the
+   If used, this function should be called before :func:`initscr` or
+   :func:`newterm` are called,
+   and affects every screen created afterwards.
+   When *flag* is ``False``, the values of lines and columns specified in the
    terminfo database will be used, even if environment variables :envvar:`LINES`
    and :envvar:`COLUMNS` (used by default) are set, or if curses is running in a
    window (in which case default behavior would be to use the window size if
@@ -1106,6 +1112,9 @@ Utilities
    to distinguish between an individual escape character entered on the
    keyboard from escape sequences sent by cursor and function keys.
 
+   Depending on the curses library, the setting may apply to all screens,
+   not only to the current one.
+
    .. versionadded:: 3.9
 
 .. function:: get_tabsize()
@@ -1119,6 +1128,9 @@ Utilities
    Sets the number of columns used by the curses library when converting a tab
    character to spaces as it adds the tab to a window.
 
+   Depending on the curses library, the setting may apply to all screens,
+   not only to the current one, and creating a screen may reset it.
+
    .. versionadded:: 3.9
 
 .. function:: napms(ms)

Doc/library/logging.config.rst

@@ -555,7 +555,7 @@ following configuration::
       'bar' : 'baz',
       'spam' : 99.9,
       'answer' : 42,
-      '.' {
+      '.' : {
         'foo': 'bar',
         'baz': 'bozz'
       }

Doc/library/pdb.rst

@@ -834,7 +834,7 @@ can be overridden by the local file.
         def inner(x):
             1 / x
 
-         out()
+        out()
 
    calling ``pdb.pm()`` will allow to move between exceptions::
 

Doc/reference/datamodel.rst

@@ -798,12 +798,12 @@ Generator functions
    single: generator; function
    single: generator; iterator
 
-A function or method which uses the :keyword:`yield` statement (see section
-:ref:`yield`) is called a :dfn:`generator function`.  Such a function, when
+A function or method which contains a :keyword:`yield` expression (see section
+:ref:`yieldexpr`) is called a :dfn:`generator function`.  Such a function, when
 called, always returns an :term:`iterator` object which can be used to
 execute the body of the function:  calling the iterator's
 :meth:`iterator.__next__` method will cause the function to execute until
-it provides a value using the :keyword:`!yield` statement.  When the
+it provides a value using the :keyword:`!yield` expression.  When the
 function executes a :keyword:`return` statement or falls off the end, a
 :exc:`StopIteration` exception is raised and the iterator will have
 reached the end of the set of values to be returned.
@@ -830,7 +830,7 @@ Asynchronous generator functions
    single: asynchronous generator; asynchronous iterator
 
 A function or method which is defined using :keyword:`async def` and
-which uses the :keyword:`yield` statement is called a
+which contains a :keyword:`yield` expression is called a
 :dfn:`asynchronous generator function`.  Such a function, when called,
 returns an :term:`asynchronous iterator` object which can be used in an
 :keyword:`async for` statement to execute the body of the function.

Doc/whatsnew/3.16.rst

@@ -412,9 +412,9 @@ io
 ipaddress
 ---------
 
-* Add :meth:`~ipaddress.IPv4Network.next_network` and
-  :meth:`~ipaddress.IPv6Network.next_network` methods to find the next nearest
-  network with a specific prefix size.
+* Add :meth:`IPv4Network.next_network() <ipaddress.IPv4Network.next_network>`
+  and :meth:`IPv6Network.next_network() <ipaddress.IPv6Network.next_network>`
+  methods to find the next nearest network with a specific prefix size.
   (Contributed by Faisal Mahmood in :gh:`87027`.)
 
 

Lib/annotationlib.py

@@ -191,12 +191,27 @@ def evaluate(
 
         arg = self.__forward_arg__
         if arg.isidentifier() and not keyword.iskeyword(arg):
+            resolved = _sentinel
             if arg in locals:
-                return locals[arg]
+                resolved = locals[arg]
             elif arg in globals:
-                return globals[arg]
+                resolved = globals[arg]
             elif hasattr(builtins, arg):
-                return getattr(builtins, arg)
+                resolved = getattr(builtins, arg)
+
+            if resolved is not _sentinel:
+                if isinstance(resolved, types.LazyImportType):
+                    # We try reifying the lazy object. If this fails, we propagate
+                    # the error in the VALUE format and leave the
+                    # ForwardRef unresolved in the FORWARDREF format.
+                    try:
+                        return resolved.resolve()
+                    except Exception:
+                        if not is_forwardref_format:
+                            raise
+                        return self
+                else:
+                    return resolved
             elif is_forwardref_format:
                 return self
             else:

Lib/ipaddress.py

@@ -1124,11 +1124,15 @@ def next_network(self, next_prefix=None):
 
         Args:
             next_prefix: The desired next prefix length, if not specified the
-            same self.prefixlen will be used
+            same self.prefixlen will be used.
 
         Returns:
             An IPv(4|6) Network object of the next closest network.
 
+        Raises:
+            ValueError: If next_prefix is outside the range of valid prefix
+            lengths, or if no further network of that size exists.
+
         """
         if next_prefix is None:
             next_prefix = self.prefixlen
@@ -1150,15 +1154,13 @@ def next_network(self, next_prefix=None):
             ((new_netmask._ip & self.network_address._ip) >> bit_shift) + 1
         ) << bit_shift
 
-        try:
-            return self.__class__(
-                f"{self._string_from_ip_int(next_ip)}/{next_prefix}"
-            )
-        except OverflowError:
+        if next_ip > self._ALL_ONES:
             raise ValueError(
                 f"out of address space, cannot make another /{next_prefix} "
                 "network"
-            ) from None
+            )
+
+        return self.__class__((next_ip, next_prefix))
 
 
 class _BaseConstants:

Lib/test/mathdata/math_testcases.txt

@@ -1311,9 +1311,9 @@ atan2pi20000 atan2pi inf 0 -> 0.5
 atan2pi20001 atan2pi -inf 0 -> -0.5
 atan2pi20002 atan2pi nan 0 -> nan
 
-atan2pi20000 atan2pi inf -0 -> 0.5
-atan2pi20001 atan2pi -inf -0 -> -0.5
-atan2pi20002 atan2pi nan -0 -> nan
+atan2pi21000 atan2pi inf -0 -> 0.5
+atan2pi21001 atan2pi -inf -0 -> -0.5
+atan2pi21002 atan2pi nan -0 -> nan
 
 atan2pi20003 atan2pi inf 1 -> 0.5
 atan2pi20004 atan2pi -inf 1 -> -0.5
@@ -1339,9 +1339,9 @@ atan2pi30000 atan2pi 0 inf -> 0.0
 atan2pi30001 atan2pi 0 -inf -> 1.0
 atan2pi30002 atan2pi 0 nan -> nan
 
-atan2pi30000 atan2pi -0 inf -> -0.0
-atan2pi30001 atan2pi -0 -inf -> -1.0
-atan2pi30002 atan2pi -0 nan -> nan
+atan2pi31000 atan2pi -0 inf -> -0.0
+atan2pi31001 atan2pi -0 -inf -> -1.0
+atan2pi31002 atan2pi -0 nan -> nan
 
 atan2pi30003 atan2pi 1 inf -> 0.0
 atan2pi30004 atan2pi 1 -inf -> 1.0
@@ -2247,3 +2247,8 @@ tanpi10275 tanpi -1.6591963470121216 -> 1.829921944286168
 tanpi20001 tanpi inf -> nan invalid
 tanpi20002 tanpi -inf -> nan invalid
 tanpi20003 tanpi nan -> nan
+
+tanpi30001 tanpi 0.5 -> inf divide-by-zero
+tanpi30002 tanpi -0.5 -> -inf divide-by-zero
+tanpi30003 tanpi 1.5 -> -inf divide-by-zero
+tanpi30004 tanpi -1.5 -> inf divide-by-zero