Merge branch 'main' into warsaw/asottle-gh-75723

Author: warsaw

Doc/c-api/unicode.rst

@@ -762,7 +762,7 @@ APIs:
    The string must not have been “used” yet.
    See :c:func:`PyUnicode_New` for details.
 
-   Return the number of written character, or return ``-1`` and raise an
+   Return the number of written characters, or return ``-1`` and raise an
    exception on error.
 
    .. versionadded:: 3.3
@@ -1174,7 +1174,7 @@ These are the UTF-8 codec APIs:
    .. versionadded:: 3.3
 
    .. versionchanged:: 3.7
-      The return type is now ``const char *`` rather of ``char *``.
+      The return type is now ``const char *`` rather than ``char *``.
 
    .. versionchanged:: 3.10
       This function is a part of the :ref:`limited API <limited-c-api>`.
@@ -1196,7 +1196,7 @@ These are the UTF-8 codec APIs:
    .. versionadded:: 3.3
 
    .. versionchanged:: 3.7
-      The return type is now ``const char *`` rather of ``char *``.
+      The return type is now ``const char *`` rather than ``char *``.
 
 
 UTF-32 Codecs

Doc/deprecations/pending-removal-in-3.16.rst

@@ -84,7 +84,7 @@ Pending removal in Python 3.16
 
 * :mod:`symtable`:
 
-  * The :meth:`Class.get_methods <symtable.Class.get_methods>` method
+  * The :meth:`!symtable.Class.get_methods` method
     has been deprecated since Python 3.14.
 
 * :mod:`sys`:

Doc/library/pathlib.rst

@@ -1266,6 +1266,8 @@ Reading and writing files
       >>> p.read_text()
       'Text file contents'
 
+   Return the number of characters written.
+
    An existing file of the same name is overwritten. The optional parameters
    have the same meaning as in :func:`open`.
 
@@ -1286,6 +1288,8 @@ Reading and writing files
       >>> p.read_bytes()
       b'Binary file contents'
 
+   Return the number of bytes written.
+
    An existing file of the same name is overwritten.
 
    .. versionadded:: 3.5

Doc/library/symtable.rst

@@ -187,57 +187,6 @@ Examining Symbol Tables
 
    A namespace of a class.  This class inherits from :class:`SymbolTable`.
 
-   .. method:: get_methods()
-
-      Return a tuple containing the names of method-like functions declared
-      in the class.
-
-      Here, the term 'method' designates *any* function defined in the class
-      body via :keyword:`def` or :keyword:`async def`.
-
-      Functions defined in a deeper scope (e.g., in an inner class) are not
-      picked up by :meth:`get_methods`.
-
-      For example:
-
-      .. testsetup:: symtable.Class.get_methods
-
-         import warnings
-         context = warnings.catch_warnings()
-         context.__enter__()
-         warnings.simplefilter("ignore", category=DeprecationWarning)
-
-      .. testcleanup:: symtable.Class.get_methods
-
-         context.__exit__()
-
-      .. doctest:: symtable.Class.get_methods
-
-         >>> import symtable
-         >>> st = symtable.symtable('''
-         ... def outer(): pass
-         ...
-         ... class A:
-         ...    def f():
-         ...        def w(): pass
-         ...
-         ...    def g(self): pass
-         ...
-         ...    @classmethod
-         ...    async def h(cls): pass
-         ...
-         ...    global outer
-         ...    def outer(self): pass
-         ... ''', 'test', 'exec')
-         >>> class_A = st.get_children()[2]
-         >>> class_A.get_methods()
-         ('f', 'g', 'h')
-
-      Although ``A().f()`` raises :exc:`TypeError` at runtime, ``A.f`` is still
-      considered as a method-like function.
-
-      .. deprecated-removed:: 3.14 3.16
-
 
 .. class:: Symbol
 

Doc/tools/removed-ids.txt

@@ -5,3 +5,6 @@ c-api/allocation.html: deprecated-aliases
 c-api/file.html: deprecated-api
 
 library/asyncio-task.html: terminating-a-task-group
+
+# Removed APIs
+library/symtable.html: symtable.Class.get_methods

Doc/whatsnew/3.14.rst

@@ -2718,7 +2718,7 @@ New deprecations
   (Contributed by Tian Gao in :gh:`124369` and :gh:`125951`.)
 
 * :mod:`symtable`:
-  Deprecate :meth:`symtable.Class.get_methods` due to the lack of interest,
+  Deprecate :meth:`!symtable.Class.get_methods` due to the lack of interest,
   scheduled for removal in Python 3.16.
   (Contributed by Bénédikt Tran in :gh:`119698`.)
 

Doc/whatsnew/3.15.rst

@@ -798,7 +798,7 @@ Other language changes
               n = buffer.find(b'\n')
               data = bytes(buffer[:n + 1])
               del buffer[:n + 1]
-              assert data == b'abc'
+              assert data == b'abc\n'
               assert buffer == bytearray(b'def')
 
         - .. code:: python

Doc/whatsnew/3.16.rst

@@ -120,6 +120,12 @@ functools
 * Calling the Python implementation of :func:`functools.reduce` with *function*
   or *sequence* as keyword arguments has been deprecated since Python 3.14.
 
+symtable
+--------
+
+* The :meth:`!symtable.Class.get_methods` method
+  which has been deprecated since Python 3.14.
+
 sysconfig
 ---------
 

Include/internal/pycore_pyhash.h

@@ -27,14 +27,14 @@ _Py_HashPointerRaw(const void *ptr)
  *   pppppppp ssssssss ........  fnv -- two Py_hash_t
  *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t
  *   ........ ........ ssssssss  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeeeeeee  pyexpat XML hash salt
+ *   eeeeeeee eeeeeeee eeeeeeee  pyexpat XML hash salt
  *
  * memory layout on 32 bit systems
  *   cccccccc cccccccc cccccccc  uc
  *   ppppssss ........ ........  fnv -- two Py_hash_t
  *   k0k0k0k0 k1k1k1k1 ........  siphash -- two uint64_t (*)
  *   ........ ........ ssss....  djbx33a -- 16 bytes padding + one Py_hash_t
- *   ........ ........ eeee....  pyexpat XML hash salt
+ *   eeeeeeee eeeeeeee eeee....  pyexpat XML hash salt
  *
  * (*) The siphash member may not be available on 32 bit platforms without
  *     an unsigned int64 data type.
@@ -58,7 +58,9 @@ typedef union {
         Py_hash_t suffix;
     } djbx33a;
     struct {
-        unsigned char padding[16];
+        /* 16 bytes for XML_SetHashSalt16Bytes */
+        uint8_t hashsalt16[16];
+        /* 4/8 bytes for legacy XML_SetHashSalt */
         Py_hash_t hashsalt;
     } expat;
 } _Py_HashSecret_t;

Include/pyexpat.h

@@ -62,6 +62,9 @@ struct PyExpat_CAPI
         XML_Parser parser, unsigned long long activationThresholdBytes);
     XML_Bool (*SetBillionLaughsAttackProtectionMaximumAmplification)(
         XML_Parser parser, float maxAmplificationFactor);
+    /* might be NULL for expat < 2.8.0 */
+    XML_Bool (*SetHashSalt16Bytes)(
+        XML_Parser parser, const uint8_t entropy[16]);
     /* always add new stuff to the end! */
 };