Merge branch 'main' into fix-referencelink

Author: rhettinger

Doc/c-api/unicode.rst

@@ -1398,6 +1398,20 @@ They all return ``NULL`` or ``-1`` if an exception occurs.
    separator.  At most *maxsplit* splits will be done.  If negative, no limit is
    set.  Separators are not included in the resulting list.
 
+   On error, return ``NULL`` with an exception set.
+
+   Equivalent to :py:meth:`str.split`.
+
+
+.. c:function:: PyObject* PyUnicode_RSplit(PyObject *unicode, PyObject *sep, Py_ssize_t maxsplit)
+
+   Similar to :c:func:`PyUnicode_Split`, but splitting will be done beginning
+   at the end of the string.
+
+   On error, return ``NULL`` with an exception set.
+
+   Equivalent to :py:meth:`str.rsplit`.
+
 
 .. c:function:: PyObject* PyUnicode_Splitlines(PyObject *unicode, int keepends)
 
@@ -1406,6 +1420,33 @@ They all return ``NULL`` or ``-1`` if an exception occurs.
    characters are not included in the resulting strings.
 
 
+.. c:function:: PyObject* PyUnicode_Partition(PyObject *unicode, PyObject *sep)
+
+   Split a Unicode string at the first occurrence of *sep*, and return
+   a 3-tuple containing the part before the separator, the separator itself,
+   and the part after the separator. If the separator is not found,
+   return a 3-tuple containing the string itself, followed by two empty strings.
+
+   *sep* must not be empty.
+
+   On error, return ``NULL`` with an exception set.
+
+   Equivalent to :py:meth:`str.partition`.
+
+
+.. c:function:: PyObject* PyUnicode_RPartition(PyObject *unicode, PyObject *sep)
+
+   Similar to :c:func:`PyUnicode_Partition`, but split a Unicode string at the
+   last occurrence of *sep*. If the separator is not found, return a 3-tuple
+   containing two empty strings, followed by the string itself.
+
+   *sep* must not be empty.
+
+   On error, return ``NULL`` with an exception set.
+
+   Equivalent to :py:meth:`str.rpartition`.
+
+
 .. c:function:: PyObject* PyUnicode_Join(PyObject *separator, PyObject *seq)
 
    Join a sequence of strings using the given *separator* and return the resulting

Doc/data/refcounts.dat

@@ -2655,13 +2655,26 @@ PyUnicode_Concat:PyObject*::+1:
 PyUnicode_Concat:PyObject*:left:0:
 PyUnicode_Concat:PyObject*:right:0:
 
+PyUnicode_Partition:PyObject*::+1:
+PyUnicode_Partition:PyObject*:unicode:0:
+PyUnicode_Partition:PyObject*:sep:0:
+
+PyUnicode_RPartition:PyObject*::+1:
+PyUnicode_RPartition:PyObject*:unicode:0:
+PyUnicode_RPartition:PyObject*:sep:0:
+
+PyUnicode_RSplit:PyObject*::+1:
+PyUnicode_RSplit:PyObject*:unicode:0:
+PyUnicode_RSplit:PyObject*:sep:0:
+PyUnicode_RSplit:Py_ssize_t:maxsplit::
+
 PyUnicode_Split:PyObject*::+1:
-PyUnicode_Split:PyObject*:left:0:
-PyUnicode_Split:PyObject*:right:0:
+PyUnicode_Split:PyObject*:unicode:0:
+PyUnicode_Split:PyObject*:sep:0:
 PyUnicode_Split:Py_ssize_t:maxsplit::
 
 PyUnicode_Splitlines:PyObject*::+1:
-PyUnicode_Splitlines:PyObject*:s:0:
+PyUnicode_Splitlines:PyObject*:unicode:0:
 PyUnicode_Splitlines:int:keepend::
 
 PyUnicode_Translate:PyObject*::+1:

Doc/deprecations/c-api-pending-removal-in-3.18.rst

@@ -11,6 +11,32 @@ Pending removal in Python 3.18
     use :c:func:`PyLongWriter_Create`.
   * :c:func:`!_PyThreadState_UncheckedGet`: use :c:func:`PyThreadState_GetUnchecked`.
   * :c:func:`!_PyUnicode_AsString`: use :c:func:`PyUnicode_AsUTF8`.
+  * :c:func:`!_PyUnicodeWriter_Init`:
+    replace ``_PyUnicodeWriter_Init(&writer)`` with
+    :c:func:`writer = PyUnicodeWriter_Create(0) <PyUnicodeWriter_Create>`.
+  * :c:func:`!_PyUnicodeWriter_Finish`:
+    replace ``_PyUnicodeWriter_Finish(&writer)`` with
+    :c:func:`PyUnicodeWriter_Finish(writer) <PyUnicodeWriter_Finish>`.
+  * :c:func:`!_PyUnicodeWriter_Dealloc`:
+    replace ``_PyUnicodeWriter_Dealloc(&writer)`` with
+    :c:func:`PyUnicodeWriter_Discard(writer) <PyUnicodeWriter_Discard>`.
+  * :c:func:`!_PyUnicodeWriter_WriteChar`:
+    replace ``_PyUnicodeWriter_WriteChar(&writer, ch)`` with
+    :c:func:`PyUnicodeWriter_WriteChar(writer, ch) <PyUnicodeWriter_WriteChar>`.
+  * :c:func:`!_PyUnicodeWriter_WriteStr`:
+    replace ``_PyUnicodeWriter_WriteStr(&writer, str)`` with
+    :c:func:`PyUnicodeWriter_WriteStr(writer, str) <PyUnicodeWriter_WriteStr>`.
+  * :c:func:`!_PyUnicodeWriter_WriteSubstring`:
+    replace ``_PyUnicodeWriter_WriteSubstring(&writer, str, start, end)`` with
+    :c:func:`PyUnicodeWriter_WriteSubstring(writer, str, start, end) <PyUnicodeWriter_WriteSubstring>`.
+  * :c:func:`!_PyUnicodeWriter_WriteASCIIString`:
+    replace ``_PyUnicodeWriter_WriteASCIIString(&writer, str)`` with
+    :c:func:`PyUnicodeWriter_WriteUTF8(writer, str) <PyUnicodeWriter_WriteUTF8>`.
+  * :c:func:`!_PyUnicodeWriter_WriteLatin1String`:
+    replace ``_PyUnicodeWriter_WriteLatin1String(&writer, str)`` with
+    :c:func:`PyUnicodeWriter_WriteUTF8(writer, str) <PyUnicodeWriter_WriteUTF8>`.
+  * :c:func:`!_PyUnicodeWriter_Prepare`: (no replacement).
+  * :c:func:`!_PyUnicodeWriter_PrepareKind`: (no replacement).
   * :c:func:`!_Py_HashPointer`: use :c:func:`Py_HashPointer`.
   * :c:func:`!_Py_fopen_obj`: use :c:func:`Py_fopen`.
 

Doc/howto/logging-cookbook.rst

@@ -825,16 +825,29 @@ To test these files, do the following in a POSIX environment:
    which will lead to records being written to the log.
 
 #. Inspect the log files in the :file:`run` subdirectory. You should see the
-   most recent log lines in files matching the pattern :file:`app.log*`. They won't be in
-   any particular order, since they have been handled concurrently by different
-   worker processes in a non-deterministic way.
+   most recent log lines in files matching the pattern :file:`app.log*`. They
+   won't be in any particular order, since they have been handled concurrently
+   by different worker processes in a non-deterministic way.
 
 #. You can shut down the listener and the web application by running
    ``venv/bin/supervisorctl -c supervisor.conf shutdown``.
 
 You may need to tweak the configuration files in the unlikely event that the
 configured ports clash with something else in your test environment.
 
+The default configuration uses a TCP socket on port 9020. You can use a Unix
+Domain socket instead of a TCP socket by doing the following:
+
+#. In :file:`listener.json`, add a ``socket`` key with the path to the domain
+   socket you want to use. If this key is present, the listener listens on the
+   corresponding domain socket and not on a TCP socket (the ``port`` key is
+   ignored).
+
+#. In :file:`webapp.json`, change the socket handler configuration dictionary
+   so that the ``host`` value is the path to the domain socket, and set the
+   ``port`` value to ``null``.
+
+
 .. currentmodule:: logging
 
 .. _context-info:

Doc/library/readline.rst

@@ -65,13 +65,13 @@ The following functions relate to the init file and user configuration:
 .. function:: parse_and_bind(string)
 
    Execute the init line provided in the *string* argument. This calls
-   :c:func:`rl_parse_and_bind` in the underlying library.
+   :c:func:`!rl_parse_and_bind` in the underlying library.
 
 
 .. function:: read_init_file([filename])
 
    Execute a readline initialization file. The default filename is the last filename
-   used. This calls :c:func:`rl_read_init_file` in the underlying library.
+   used. This calls :c:func:`!rl_read_init_file` in the underlying library.
 
 
 Line buffer
@@ -82,21 +82,21 @@ The following functions operate on the line buffer:
 
 .. function:: get_line_buffer()
 
-   Return the current contents of the line buffer (:c:data:`rl_line_buffer`
+   Return the current contents of the line buffer (:c:data:`!rl_line_buffer`
    in the underlying library).
 
 
 .. function:: insert_text(string)
 
    Insert text into the line buffer at the cursor position.  This calls
-   :c:func:`rl_insert_text` in the underlying library, but ignores
+   :c:func:`!rl_insert_text` in the underlying library, but ignores
    the return value.
 
 
 .. function:: redisplay()
 
    Change what's displayed on the screen to reflect the current contents of the
-   line buffer.  This calls :c:func:`rl_redisplay` in the underlying library.
+   line buffer.  This calls :c:func:`!rl_redisplay` in the underlying library.
 
 
 History file
@@ -109,21 +109,21 @@ The following functions operate on a history file:
 
    Load a readline history file, and append it to the history list.
    The default filename is :file:`~/.history`.  This calls
-   :c:func:`read_history` in the underlying library.
+   :c:func:`!read_history` in the underlying library.
 
 
 .. function:: write_history_file([filename])
 
    Save the history list to a readline history file, overwriting any
    existing file.  The default filename is :file:`~/.history`.  This calls
-   :c:func:`write_history` in the underlying library.
+   :c:func:`!write_history` in the underlying library.
 
 
 .. function:: append_history_file(nelements[, filename])
 
    Append the last *nelements* items of history to a file.  The default filename is
    :file:`~/.history`.  The file must already exist.  This calls
-   :c:func:`append_history` in the underlying library.  This function
+   :c:func:`!append_history` in the underlying library.  This function
    only exists if Python was compiled for a version of the library
    that supports it.
 
@@ -135,7 +135,7 @@ The following functions operate on a history file:
 
    Set or return the desired number of lines to save in the history file.
    The :func:`write_history_file` function uses this value to truncate
-   the history file, by calling :c:func:`history_truncate_file` in
+   the history file, by calling :c:func:`!history_truncate_file` in
    the underlying library.  Negative values imply
    unlimited history file size.
 
@@ -148,7 +148,7 @@ The following functions operate on a global history list:
 
 .. function:: clear_history()
 
-   Clear the current history.  This calls :c:func:`clear_history` in the
+   Clear the current history.  This calls :c:func:`!clear_history` in the
    underlying library.  The Python function only exists if Python was
    compiled for a version of the library that supports it.
 
@@ -163,32 +163,32 @@ The following functions operate on a global history list:
 .. function:: get_history_item(index)
 
    Return the current contents of history item at *index*.  The item index
-   is one-based.  This calls :c:func:`history_get` in the underlying library.
+   is one-based.  This calls :c:func:`!history_get` in the underlying library.
 
 
 .. function:: remove_history_item(pos)
 
    Remove history item specified by its position from the history.
-   The position is zero-based.  This calls :c:func:`remove_history` in
+   The position is zero-based.  This calls :c:func:`!remove_history` in
    the underlying library.
 
 
 .. function:: replace_history_item(pos, line)
 
    Replace history item specified by its position with *line*.
-   The position is zero-based.  This calls :c:func:`replace_history_entry`
+   The position is zero-based.  This calls :c:func:`!replace_history_entry`
    in the underlying library.
 
 
 .. function:: add_history(line)
 
    Append *line* to the history buffer, as if it was the last line typed.
-   This calls :c:func:`add_history` in the underlying library.
+   This calls :c:func:`!add_history` in the underlying library.
 
 
 .. function:: set_auto_history(enabled)
 
-   Enable or disable automatic calls to :c:func:`add_history` when reading
+   Enable or disable automatic calls to :c:func:`!add_history` when reading
    input via readline.  The *enabled* argument should be a Boolean value
    that when true, enables auto history, and that when false, disables
    auto history.
@@ -206,7 +206,7 @@ Startup hooks
 
 .. function:: set_startup_hook([function])
 
-   Set or remove the function invoked by the :c:data:`rl_startup_hook`
+   Set or remove the function invoked by the :c:data:`!rl_startup_hook`
    callback of the underlying library.  If *function* is specified, it will
    be used as the new hook function; if omitted or ``None``, any function
    already installed is removed.  The hook is called with no
@@ -215,7 +215,7 @@ Startup hooks
 
 .. function:: set_pre_input_hook([function])
 
-   Set or remove the function invoked by the :c:data:`rl_pre_input_hook`
+   Set or remove the function invoked by the :c:data:`!rl_pre_input_hook`
    callback of the underlying library.  If *function* is specified, it will
    be used as the new hook function; if omitted or ``None``, any
    function already installed is removed.  The hook is called
@@ -247,9 +247,9 @@ with a custom completer, a different set of word delimiters should be set.
    starting with *text*.
 
    The installed completer function is invoked by the *entry_func* callback
-   passed to :c:func:`rl_completion_matches` in the underlying library.
+   passed to :c:func:`!rl_completion_matches` in the underlying library.
    The *text* string comes from the first parameter to the
-   :c:data:`rl_attempted_completion_function` callback of the
+   :c:data:`!rl_attempted_completion_function` callback of the
    underlying library.
 
 
@@ -261,7 +261,7 @@ with a custom completer, a different set of word delimiters should be set.
 .. function:: get_completion_type()
 
    Get the type of completion being attempted.  This returns the
-   :c:data:`rl_completion_type` variable in the underlying library as
+   :c:data:`!rl_completion_type` variable in the underlying library as
    an integer.
 
 
@@ -270,7 +270,7 @@ with a custom completer, a different set of word delimiters should be set.
 
    Get the beginning or ending index of the completion scope.
    These indexes are the *start* and *end* arguments passed to the
-   :c:data:`rl_attempted_completion_function` callback of the
+   :c:data:`!rl_attempted_completion_function` callback of the
    underlying library.  The values may be different in the same
    input editing scenario based on the underlying C readline implementation.
    Ex: libedit is known to behave differently than libreadline.
@@ -281,7 +281,7 @@ with a custom completer, a different set of word delimiters should be set.
 
    Set or get the word delimiters for completion.  These determine the
    start of the word to be considered for completion (the completion scope).
-   These functions access the :c:data:`rl_completer_word_break_characters`
+   These functions access the :c:data:`!rl_completer_word_break_characters`
    variable in the underlying library.
 
 
@@ -291,7 +291,7 @@ with a custom completer, a different set of word delimiters should be set.
    specified, it will be used as the new completion display function;
    if omitted or ``None``, any completion display function already
    installed is removed.  This sets or clears the
-   :c:data:`rl_completion_display_matches_hook` callback in the
+   :c:data:`!rl_completion_display_matches_hook` callback in the
    underlying library.  The completion display function is called as
    ``function(substitution, [matches], longest_match_length)`` once
    each time matches need to be displayed.

Doc/tools/.nitignore

@@ -38,7 +38,6 @@ Doc/library/platform.rst
 Doc/library/plistlib.rst
 Doc/library/profile.rst
 Doc/library/pyexpat.rst
-Doc/library/readline.rst
 Doc/library/resource.rst
 Doc/library/select.rst
 Doc/library/signal.rst