[pull] main from python:main

.github/workflows/build.yml

@@ -706,7 +706,6 @@ jobs:
       uses: re-actors/alls-green@05ac9388f0aebcb5727afa17fcccfecd6f8ec5fe
       with:
         allowed-failures: >-
-          build-ios,
           build-windows-msi,
           build-ubuntu-ssltests-awslc,
           build-ubuntu-ssltests-openssl,

Doc/c-api/extension-modules.rst

@@ -282,7 +282,7 @@ Legacy single-phase initialization
    However, there are no plans to remove support for it.
 
 In single-phase initialization, the old-style
-:ref:`initializaton function <extension-pyinit>` (``PyInit_modulename``)
+:ref:`initialization function <extension-pyinit>` (``PyInit_modulename``)
 should create, populate and return a module object.
 This is typically done using :c:func:`PyModule_Create` and functions like
 :c:func:`PyModule_AddObjectRef`.

Doc/c-api/module.rst

@@ -588,7 +588,7 @@ A module's token -- and the *your_token* value to use in the above code -- is:
      behave as if it was created from that :c:type:`PyModuleDef`.
      In particular, the module state must have matching layout and semantics.
 
-   Modules created from :c:type:`PyModuleDef` allways use the address of
+   Modules created from :c:type:`PyModuleDef` always use the address of
    the :c:type:`PyModuleDef` as the token.
    This means that :c:macro:`!Py_mod_token` cannot be used in
    :c:member:`PyModuleDef.m_slots`.

Doc/library/http.client.rst

@@ -319,6 +319,12 @@ HTTPConnection Objects
       :class:`str` or bytes-like object that is not also a file as the
       body representation.
 
+   .. note::
+
+      Note that you must have read the whole response or call :meth:`close`
+      if :meth:`getresponse` raised an non-:exc:`ConnectionError` exception
+      before you can send a new request to the server.
+
    .. versionchanged:: 3.2
       *body* can now be an iterable.
 
@@ -334,16 +340,15 @@ HTTPConnection Objects
    Should be called after a request is sent to get the response from the server.
    Returns an :class:`HTTPResponse` instance.
 
-   .. note::
-
-      Note that you must have read the whole response before you can send a new
-      request to the server.
-
    .. versionchanged:: 3.5
       If a :exc:`ConnectionError` or subclass is raised, the
       :class:`HTTPConnection` object will be ready to reconnect when
       a new request is sent.
 
+      Note that this does not apply to :exc:`OSError`\s raised by the underlying
+      socket. Instead the caller is responsible to call :meth:`close` on the
+      existing connection.
+
 
 .. method:: HTTPConnection.set_debuglevel(level)
 

Doc/library/inspect.rst

@@ -640,7 +640,7 @@ Retrieving source code
       Added parameters *inherit_class_doc* and *fallback_to_class_doc*.
 
       Documentation strings on :class:`~functools.cached_property`
-      objects are now inherited if not overriden.
+      objects are now inherited if not overridden.
 
 
 .. function:: getcomments(object)

Doc/reference/lexical_analysis.rst

@@ -1227,7 +1227,7 @@ Whitespace is significant in these situations:
   string contents.
 * In ``fstring_replacement_field``, if ``f_debug_specifier`` is present,
   all whitespace after the opening brace until the ``f_debug_specifier``,
-  as well as whitespace immediatelly following ``f_debug_specifier``,
+  as well as whitespace immediately following ``f_debug_specifier``,
   is retained as part of the expression.
 
   .. impl-detail::

Lib/hmac.py

@@ -171,6 +171,7 @@ def copy(self):
         # Call __new__ directly to avoid the expensive __init__.
         other = self.__class__.__new__(self.__class__)
         other.digest_size = self.digest_size
+        other.block_size = self.block_size
         if self._hmac:
             other._hmac = self._hmac.copy()
             other._inner = other._outer = None