Merge branch 'main' into issue-82129-2

Doc/Makefile

@@ -152,7 +152,7 @@ htmlview: html
  $(PYTHON) -c "import os, webbrowser; webbrowser.open('file://' + os.path.realpath('build/html/index.html'))"
 
 .PHONY: htmllive
-htmllive: SPHINXBUILD = $(VENVDIR)/bin/sphinx-autobuild
+htmllive: SPHINXBUILD = PATH=$(VENVDIR)/bin:$$PATH sphinx-autobuild
 htmllive: SPHINXOPTS = --re-ignore="/venv/" --open-browser --delay 0
 htmllive: _ensure-sphinx-autobuild html
 

Doc/c-api/complex.rst

@@ -79,6 +79,8 @@ pointers. This is consistent throughout the API.
  If *num* is null and *exp* is not a positive real number,
  this method returns zero and sets :c:data:`errno` to :c:macro:`!EDOM`.
 
+ Set :c:data:`errno` to :c:macro:`!ERANGE` on overflows.
+
 
 Complex Numbers as Python Objects
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Doc/c-api/exceptions.rst

@@ -1004,6 +1004,7 @@ the variables:
  single: PyExc_OverflowError (C var)
  single: PyExc_PermissionError (C var)
  single: PyExc_ProcessLookupError (C var)
+ single: PyExc_PythonFinalizationError (C var)
  single: PyExc_RecursionError (C var)
  single: PyExc_ReferenceError (C var)
  single: PyExc_RuntimeError (C var)
@@ -1096,6 +1097,8 @@ the variables:
 +-----------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_ProcessLookupError` | :exc:`ProcessLookupError` | |
 +-----------------------------------------+---------------------------------+----------+
+| :c:data:`PyExc_PythonFinalizationError` | :exc:`PythonFinalizationError` | |
++-----------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_RecursionError` | :exc:`RecursionError` | |
 +-----------------------------------------+---------------------------------+----------+
 | :c:data:`PyExc_ReferenceError` | :exc:`ReferenceError` | |

Doc/c-api/long.rst

@@ -509,6 +509,8 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
  Currently, ``-1`` corresponds to
  ``Py_ASNATIVEBYTES_NATIVE_ENDIAN | Py_ASNATIVEBYTES_UNSIGNED_BUFFER``.
 
+ .. c:namespace:: NULL
+
  ============================================= ======
  Flag Value
  ============================================= ======

Doc/c-api/module.rst

@@ -421,6 +421,8 @@ The available slot types are:
 
  Specifies one of the following values:
 
+ .. c:namespace:: NULL
+
  .. c:macro:: Py_MOD_GIL_USED
 
  The module depends on the presence of the global interpreter lock (GIL),

Doc/c-api/monitoring.rst

@@ -133,7 +133,7 @@ Managing the Monitoring State
 Monitoring states can be managed with the help of monitoring scopes. A scope
 would typically correspond to a python function.
 
-.. :c:function:: int PyMonitoring_EnterScope(PyMonitoringState *state_array, uint64_t *version, const uint8_t *event_types, Py_ssize_t length)
+.. c:function:: int PyMonitoring_EnterScope(PyMonitoringState *state_array, uint64_t *version, const uint8_t *event_types, Py_ssize_t length)
 
  Enter a monitored scope. ``event_types`` is an array of the event IDs for
  events that may be fired from the scope. For example, the ID of a ``PY_START``
@@ -158,7 +158,35 @@ would typically correspond to a python function.
  execution is paused, such as when emulating a generator, the scope needs to
  be exited and re-entered.
 
-
-.. :c:function:: int PyMonitoring_ExitScope(void)
+ The macros for *event_types* are:
+
+ .. c:namespace:: NULL
+
+ .. The table is here to make the docs searchable, and to allow automatic
+ links to the identifiers.
+
+ ================================================== =====================================
+ Macro Event
+ ================================================== =====================================
+ .. c:macro:: PY_MONITORING_EVENT_BRANCH :monitoring-event:`BRANCH`
+ .. c:macro:: PY_MONITORING_EVENT_CALL :monitoring-event:`CALL`
+ .. c:macro:: PY_MONITORING_EVENT_C_RAISE :monitoring-event:`C_RAISE`
+ .. c:macro:: PY_MONITORING_EVENT_C_RETURN :monitoring-event:`C_RETURN`
+ .. c:macro:: PY_MONITORING_EVENT_EXCEPTION_HANDLED :monitoring-event:`EXCEPTION_HANDLED`
+ .. c:macro:: PY_MONITORING_EVENT_INSTRUCTION :monitoring-event:`INSTRUCTION`
+ .. c:macro:: PY_MONITORING_EVENT_JUMP :monitoring-event:`JUMP`
+ .. c:macro:: PY_MONITORING_EVENT_LINE :monitoring-event:`LINE`
+ .. c:macro:: PY_MONITORING_EVENT_PY_RESUME :monitoring-event:`PY_RESUME`
+ .. c:macro:: PY_MONITORING_EVENT_PY_RETURN :monitoring-event:`PY_RETURN`
+ .. c:macro:: PY_MONITORING_EVENT_PY_START :monitoring-event:`PY_START`
+ .. c:macro:: PY_MONITORING_EVENT_PY_THROW :monitoring-event:`PY_THROW`
+ .. c:macro:: PY_MONITORING_EVENT_PY_UNWIND :monitoring-event:`PY_UNWIND`
+ .. c:macro:: PY_MONITORING_EVENT_PY_YIELD :monitoring-event:`PY_YIELD`
+ .. c:macro:: PY_MONITORING_EVENT_RAISE :monitoring-event:`RAISE`
+ .. c:macro:: PY_MONITORING_EVENT_RERAISE :monitoring-event:`RERAISE`
+ .. c:macro:: PY_MONITORING_EVENT_STOP_ITERATION :monitoring-event:`STOP_ITERATION`
+ ================================================== =====================================
+
+.. c:function:: int PyMonitoring_ExitScope(void)
 
  Exit the last scope that was entered with ``PyMonitoring_EnterScope``.

Doc/c-api/type.rst

@@ -264,6 +264,24 @@ Type Objects
 
  .. versionadded:: 3.11
 
+.. c:function:: int PyType_GetBaseByToken(PyTypeObject *type, void *token, PyTypeObject **result)
+
+ Find the first superclass in *type*'s :term:`method resolution order` whose
+ :c:macro:`Py_tp_token` token is equal to the given one.
+
+ * If found, set *\*result* to a new :term:`strong reference`
+ to it and return ``1``.
+ * If not found, set *\*result* to ``NULL`` and return ``0``.
+ * On error, set *\*result* to ``NULL`` and return ``-1`` with an
+ exception set.
+
+ The *result* argument may be ``NULL``, in which case *\*result* is not set.
+ Use this if you need only the return value.
+
+ The *token* argument may not be ``NULL``.
+
+ .. versionadded:: 3.14
+
 .. c:function:: int PyUnstable_Type_AssignVersionTag(PyTypeObject *type)
 
  Attempt to assign a version tag to the given type.
@@ -488,6 +506,11 @@ The following functions and structs are used to create
  * ``Py_nb_add`` to set :c:member:`PyNumberMethods.nb_add`
  * ``Py_sq_length`` to set :c:member:`PySequenceMethods.sq_length`
 
+ An additional slot is supported that does not correspond to a
+ :c:type:`!PyTypeObject` struct field:
+
+ * :c:data:`Py_tp_token`
+
  The following “offset” fields cannot be set using :c:type:`PyType_Slot`:
 
  * :c:member:`~PyTypeObject.tp_weaklistoffset`
@@ -538,4 +561,47 @@ The following functions and structs are used to create
  The desired value of the slot. In most cases, this is a pointer
  to a function.
 
- Slots other than ``Py_tp_doc`` may not be ``NULL``.
+ *pfunc* values may not be ``NULL``, except for the following slots:
+
+ * ``Py_tp_doc``
+ * :c:data:`Py_tp_token` (for clarity, prefer :c:data:`Py_TP_USE_SPEC`
+ rather than ``NULL``)
+
+.. c:macro:: Py_tp_token
+
+ A :c:member:`~PyType_Slot.slot` that records a static memory layout ID
+ for a class.
+
+ If the :c:type:`PyType_Spec` of the class is statically
+ allocated, the token can be set to the spec using the special value
+ :c:data:`Py_TP_USE_SPEC`:
+
+ .. code-block:: c
+
+ static PyType_Slot foo_slots[] = {
+ {Py_tp_token, Py_TP_USE_SPEC},
+
+ It can also be set to an arbitrary pointer, but you must ensure that:
+
+ * The pointer outlives the class, so it's not reused for something else
+ while the class exists.
+ * It "belongs" to the extension module where the class lives, so it will not
+ clash with other extensions.
+
+ Use :c:func:`PyType_GetBaseByToken` to check if a class's superclass has
+ a given token -- that is, check whether the memory layout is compatible.
+
+ To get the token for a given class (without considering superclasses),
+ use :c:func:`PyType_GetSlot` with ``Py_tp_token``.
+
+ .. versionadded:: 3.14
+
+ .. c:namespace:: NULL
+
+ .. c:macro:: Py_TP_USE_SPEC
+
+ Used as a value with :c:data:`Py_tp_token` to set the token to the
+ class's :c:type:`PyType_Spec`.
+ Expands to ``NULL``.
+
+ .. versionadded:: 3.14

Doc/conf.py

@@ -132,6 +132,8 @@
  ('c:func', 'vsnprintf'),
  # Standard C types
  ('c:type', 'FILE'),
+ ('c:type', 'int8_t'),
+ ('c:type', 'int16_t'),
  ('c:type', 'int32_t'),
  ('c:type', 'int64_t'),
  ('c:type', 'intmax_t'),
@@ -141,6 +143,8 @@
  ('c:type', 'size_t'),
  ('c:type', 'ssize_t'),
  ('c:type', 'time_t'),
+ ('c:type', 'uint8_t'),
+ ('c:type', 'uint16_t'),
  ('c:type', 'uint32_t'),
  ('c:type', 'uint64_t'),
  ('c:type', 'uintmax_t'),
@@ -244,6 +248,7 @@
  ('c:data', 'PyExc_OverflowError'),
  ('c:data', 'PyExc_PermissionError'),
  ('c:data', 'PyExc_ProcessLookupError'),
+ ('c:data', 'PyExc_PythonFinalizationError'),
  ('c:data', 'PyExc_RecursionError'),
  ('c:data', 'PyExc_ReferenceError'),
  ('c:data', 'PyExc_RuntimeError'),

Doc/library/ast.rst

@@ -134,6 +134,11 @@ Node classes
  Simple indices are represented by their value, extended slices are
  represented as tuples.
 
+.. versionchanged:: 3.14
+
+ The :meth:`~object.__repr__` output of :class:`~ast.AST` nodes includes
+ the values of the node fields.
+
 .. deprecated:: 3.8
 
  Old classes :class:`!ast.Num`, :class:`!ast.Str`, :class:`!ast.Bytes`,

Doc/whatsnew/3.14.rst

@@ -554,6 +554,11 @@ New Features
 
  (Contributed by Victor Stinner in :gh:`107954`.)
 
+* Add :c:func:`PyType_GetBaseByToken` and :c:data:`Py_tp_token` slot for easier
+ superclass identification, which attempts to resolve the `type checking issue
+ <https://peps.python.org/pep-0630/#type-checking>`__ mentioned in :pep:`630`
+ (:gh:`124153`).
+
 
 Porting to Python 3.14
 ----------------------

Doc/whatsnew/3.8.rst

@@ -1755,7 +1755,7 @@ The following features and APIs have been removed from Python 3.8:
 * Starting with Python 3.3, importing ABCs from :mod:`collections` was
  deprecated, and importing should be done from :mod:`collections.abc`. Being
  able to import from collections was marked for removal in 3.8, but has been
- delayed to 3.9. (See :issue:`36952`.)
+ delayed to 3.9. (See :gh:`81134`.)
 
 * The :mod:`macpath` module, deprecated in Python 3.7, has been removed.
  (Contributed by Victor Stinner in :issue:`35471`.)

Include/cpython/object.h

@@ -269,6 +269,7 @@ typedef struct _heaptypeobject {
  struct _dictkeysobject *ht_cached_keys;
  PyObject *ht_module;
  char *_ht_tpname; // Storage for "tp_name"; see PyType_FromModuleAndSpec
+ void *ht_token; // Storage for the "Py_tp_token" slot
  struct _specialization_cache _spec_cache; // For use by the specializer.
 #ifdef Py_GIL_DISABLED
  Py_ssize_t unique_id; // ID used for thread-local refcounting

Include/object.h

@@ -391,6 +391,10 @@ PyAPI_FUNC(PyObject *) PyType_FromMetaclass(PyTypeObject*, PyObject*, PyType_Spe
 PyAPI_FUNC(void *) PyObject_GetTypeData(PyObject *obj, PyTypeObject *cls);
 PyAPI_FUNC(Py_ssize_t) PyType_GetTypeDataSize(PyTypeObject *cls);
 #endif
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030E0000
+PyAPI_FUNC(int) PyType_GetBaseByToken(PyTypeObject *, void *, PyTypeObject **);
+#define Py_TP_USE_SPEC NULL
+#endif
 
 /* Generic type check */
 PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *);

Include/typeslots.h

@@ -90,3 +90,7 @@
 /* New in 3.14 */
 #define Py_tp_vectorcall 82
 #endif
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030E0000
+/* New in 3.14 */
+#define Py_tp_token 83
+#endif

Lib/_pyio.py

@@ -242,14 +242,7 @@ def open(file, mode="r", buffering=-1, encoding=None, errors=None,
  buffering = -1
  line_buffering = True
  if buffering < 0:
- buffering = DEFAULT_BUFFER_SIZE
- try:
- bs = os.fstat(raw.fileno()).st_blksize
- except (OSError, AttributeError):
- pass
- else:
- if bs > 1:
- buffering = bs
+ buffering = raw._blksize
  if buffering < 0:
  raise ValueError("invalid buffering size")
  if buffering == 0:
@@ -1565,19 +1558,15 @@ def __init__(self, file, mode='r', closefd=True, opener=None):
  os.set_inheritable(fd, False)
 
  self._closefd = closefd
- fdfstat = os.fstat(fd)
+ self._stat_atopen = os.fstat(fd)
  try:
- if stat.S_ISDIR(fdfstat.st_mode):
+ if stat.S_ISDIR(self._stat_atopen.st_mode):
  raise IsADirectoryError(errno.EISDIR,
  os.strerror(errno.EISDIR), file)
  except AttributeError:
  # Ignore the AttributeError if stat.S_ISDIR or errno.EISDIR
  # don't exist.
  pass
- self._blksize = getattr(fdfstat, 'st_blksize', 0)
- if self._blksize <= 1:
- self._blksize = DEFAULT_BUFFER_SIZE
- self._estimated_size = fdfstat.st_size
 
  if _setmode:
  # don't translate newlines (\r\n <=> \n)
@@ -1623,6 +1612,17 @@ def __repr__(self):
  return ('<%s name=%r mode=%r closefd=%r>' %
  (class_name, name, self.mode, self._closefd))
 
+ @property
+ def _blksize(self):
+ if self._stat_atopen is None:
+ return DEFAULT_BUFFER_SIZE
+
+ blksize = getattr(self._stat_atopen, "st_blksize", 0)
+ # WASI sets blsize to 0
+ if not blksize:
+ return DEFAULT_BUFFER_SIZE
+ return blksize
+
  def _checkReadable(self):
  if not self._readable:
  raise UnsupportedOperation('File not open for reading')
@@ -1655,16 +1655,20 @@ def readall(self):
  """
  self._checkClosed()
  self._checkReadable()
- if self._estimated_size <= 0:
+ if self._stat_atopen is None or self._stat_atopen.st_size <= 0:
  bufsize = DEFAULT_BUFFER_SIZE
  else:
- bufsize = self._estimated_size + 1
+ # In order to detect end of file, need a read() of at least 1
+ # byte which returns size 0. Oversize the buffer by 1 byte so the
+ # I/O can be completed with two read() calls (one for all data, one
+ # for EOF) without needing to resize the buffer.
+ bufsize = self._stat_atopen.st_size + 1
 
- if self._estimated_size > 65536:
+ if self._stat_atopen.st_size > 65536:
  try:
  pos = os.lseek(self._fd, 0, SEEK_CUR)
- if self._estimated_size >= pos:
- bufsize = self._estimated_size - pos + 1
+ if self._stat_atopen.st_size >= pos:
+ bufsize = self._stat_atopen.st_size - pos + 1
  except OSError:
  pass
 
@@ -1742,7 +1746,7 @@ def truncate(self, size=None):
  if size is None:
  size = self.tell()
  os.ftruncate(self._fd, size)
- self._estimated_size = size
+ self._stat_atopen = None
  return size
 
  def close(self):

Lib/annotationlib.py

@@ -575,7 +575,11 @@ def get_annotate_function(obj):
  Returns the __annotate__ function or None.
  """
  if isinstance(obj, type):
- return _BASE_GET_ANNOTATE(obj)
+ try:
+ return _BASE_GET_ANNOTATE(obj)
+ except AttributeError:
+ # AttributeError is raised for static types.
+ return None
  return getattr(obj, "__annotate__", None)