[pull] main from python:main

Doc/library/asyncio-protocol.rst

@@ -390,11 +390,11 @@ Subprocess Transports
    Return the transport for the communication pipe corresponding to the
    integer file descriptor *fd*:
 
-   * ``0``: readable streaming transport of the standard input (*stdin*),
+   * ``0``: writable streaming transport of the standard input (*stdin*),
      or :const:`None` if the subprocess was not created with ``stdin=PIPE``
-   * ``1``: writable streaming transport of the standard output (*stdout*),
+   * ``1``: readable streaming transport of the standard output (*stdout*),
      or :const:`None` if the subprocess was not created with ``stdout=PIPE``
-   * ``2``: writable streaming transport of the standard error (*stderr*),
+   * ``2``: readable streaming transport of the standard error (*stderr*),
      or :const:`None` if the subprocess was not created with ``stderr=PIPE``
    * other *fd*: :const:`None`
 

Doc/library/asyncio-sync.rst

@@ -157,7 +157,7 @@ Event
 
       Clear (unset) the event.
 
-      Tasks awaiting on :meth:`~Event.wait` will now block until the
+      Subsequent tasks awaiting on :meth:`~Event.wait` will now block until the
       :meth:`~Event.set` method is called again.
 
    .. method:: is_set()

Doc/library/profile.rst

@@ -791,7 +791,7 @@ Analysis of the profiler data is done using the :class:`~pstats.Stats` class.
       significant entries.  Initially, the list is taken to be the complete set
       of profiled functions.  Each restriction is either an integer (to select a
       count of lines), or a decimal fraction between 0.0 and 1.0 inclusive (to
-      select a percentage of lines), or a string that will interpreted as a
+      select a percentage of lines), or a string that will be interpreted as a
       regular expression (to pattern match the standard name that is printed).
       If several restrictions are provided, then they are applied sequentially.
       For example::

Include/internal/pycore_global_strings.h

@@ -327,6 +327,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(c_exception)
         STRUCT_FOR_ID(c_parameter_type)
         STRUCT_FOR_ID(c_return)
+        STRUCT_FOR_ID(c_stack)
         STRUCT_FOR_ID(cached_datetime_module)
         STRUCT_FOR_ID(cached_statements)
         STRUCT_FOR_ID(cadata)
@@ -341,6 +342,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(category)
         STRUCT_FOR_ID(cb_type)
         STRUCT_FOR_ID(certfile)
+        STRUCT_FOR_ID(chain)
         STRUCT_FOR_ID(check_same_thread)
         STRUCT_FOR_ID(clear)
         STRUCT_FOR_ID(close)
@@ -435,6 +437,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(excepthook)
         STRUCT_FOR_ID(exception)
         STRUCT_FOR_ID(existing_file_name)
+        STRUCT_FOR_ID(exit)
         STRUCT_FOR_ID(exp)
         STRUCT_FOR_ID(expression)
         STRUCT_FOR_ID(extend)
@@ -695,6 +698,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(rel_tol)
         STRUCT_FOR_ID(release)
         STRUCT_FOR_ID(reload)
+        STRUCT_FOR_ID(repeat)
         STRUCT_FOR_ID(repl)
         STRUCT_FOR_ID(replace)
         STRUCT_FOR_ID(reqrefs)
@@ -733,6 +737,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(shared)
         STRUCT_FOR_ID(show_cmd)
         STRUCT_FOR_ID(signed)
+        STRUCT_FOR_ID(signum)
         STRUCT_FOR_ID(size)
         STRUCT_FOR_ID(sizehint)
         STRUCT_FOR_ID(skip_file_prefixes)

Lib/test/test_faulthandler.py

@@ -360,6 +360,17 @@ def test_enable_single_thread(self):
             'Segmentation fault',
             all_threads=False)
 
+    @skip_segfault_on_android
+    def test_enable_without_c_stack(self):
+        self.check_fatal_error("""
+            import faulthandler
+            faulthandler.enable(c_stack=False)
+            faulthandler._sigsegv()
+            """,
+            3,
+            'Segmentation fault',
+            c_stack=False)
+
     @skip_segfault_on_android
     def test_disable(self):
         code = """