Merge branch 'main' into pythongh-106330-fix-match-empty-path

.github/CODEOWNERS

@@ -79,7 +79,7 @@ Doc/library/time.rst @pganssle @abalkin
 Lib/test/test_time.py @pganssle @abalkin
 Modules/timemodule.c @pganssle @abalkin
 Python/pytime.c @pganssle @abalkin
-Include/pytime.h  @pganssle @abalkin
+Include/internal/pycore_time.h @pganssle @abalkin
 
 # Email and related
 **/*mail* @python/email-team

.github/workflows/new-bugs-announce-notifier.yml

@@ -41,7 +41,10 @@ jobs:
  url : issue.data.html_url,
  labels : issue.data.labels.map(label => { return label.name }).join(", "),
  assignee : issue.data.assignees.map(assignee => { return assignee.login }),
- body : issue.data.body
+ // We need to truncate the body size, because the max size for
+ // the whole payload is 16kb. We want to be safe and assume that
+ // body can take up to ~8kb of space.
+ body : issue.data.body.substring(8000)
  };
 
  const data = {

Doc/extending/embedding.rst

@@ -87,6 +87,13 @@ perform some operation on a file. ::
  Py_ExitStatusException(status);
  }
 
+.. note::
+
+ ``#define PY_SSIZE_T_CLEAN`` was used to indicate that ``Py_ssize_t`` should be
+ used in some APIs instead of ``int``.
+ It is not necessary since Python 3.13, but we keep it here for backward compatibility.
+ See :ref:`arg-parsing-string-and-buffers` for a description of this macro.
+
 Setting :c:member:`PyConfig.program_name` should be called before
 :c:func:`Py_InitializeFromConfig` to inform the interpreter about paths to Python run-time
 libraries. Next, the Python interpreter is initialized with

Doc/extending/extending.rst

@@ -69,8 +69,10 @@ the module and a copyright notice if you like).
  headers on some systems, you *must* include :file:`Python.h` before any standard
  headers are included.
 
- It is recommended to always define ``PY_SSIZE_T_CLEAN`` before including
- ``Python.h``. See :ref:`arg-parsing-string-and-buffers` for a description of this macro.
+ ``#define PY_SSIZE_T_CLEAN`` was used to indicate that ``Py_ssize_t`` should be
+ used in some APIs instead of ``int``.
+ It is not necessary since Python 3.13, but we keep it here for backward compatibility.
+ See :ref:`arg-parsing-string-and-buffers` for a description of this macro.
 
 All user-visible symbols defined by :file:`Python.h` have a prefix of ``Py`` or
 ``PY``, except those defined in standard header files. For convenience, and

Doc/whatsnew/3.13.rst

@@ -602,3 +602,13 @@ Removed
  use ``PyObject_Vectorcall()`` which is available since Python 3.8
  (:pep:`590`).
  (Contributed by Victor Stinner in :gh:`106023`.)
+
+* Remove ``cpython/pytime.h`` header file: it only contained private functions.
+ (Contributed by Victor Stinner in :gh:`106316`.)
+
+* Remove ``_PyInterpreterState_Get()`` alias to
+ :c:func:`PyInterpreterState_Get()` which was kept for backward compatibility
+ with Python 3.8. The `pythoncapi-compat project
+ <https://github.com/python/pythoncapi-compat/>`__ can be used to get
+ :c:func:`PyInterpreterState_Get()` on Python 3.8 and older.
+ (Contributed by Victor Stinner in :gh:`106320`.)

Include/Python.h

@@ -83,7 +83,6 @@
 #include "weakrefobject.h"
 #include "structseq.h"
 #include "cpython/picklebufobject.h"
-#include "cpython/pytime.h"
 #include "codecs.h"
 #include "pyerrors.h"
 #include "pythread.h"
@@ -104,7 +103,7 @@
 #include "pystrcmp.h"
 #include "fileutils.h"
 #include "cpython/pyfpe.h"
-#include "tracemalloc.h"
+#include "cpython/tracemalloc.h"
 #include "cpython/optimizer.h"
 
 #endif /* !Py_PYTHON_H */

Include/cpython/object.h

@@ -231,7 +231,7 @@ struct _typeobject {
 };
 
 /* This struct is used by the specializer
- * It should should be treated as an opaque blob
+ * It should be treated as an opaque blob
  * by code other than the specializer and interpreter. */
 struct _specialization_cache {
  // In order to avoid bloating the bytecode with lots of inline caches, the

Include/cpython/pystate.h

@@ -40,8 +40,6 @@ PyAPI_FUNC(int) _PyInterpreterState_HasFeature(PyInterpreterState *interp,
 PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *);
 PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int);
 
-PyAPI_FUNC(PyObject *) _PyInterpreterState_GetMainModule(PyInterpreterState *);
-
 
 /* State unique per thread */
 
@@ -261,19 +259,10 @@ struct _ts {
 
 /* other API */
 
-// Alias for backward compatibility with Python 3.8
-#define _PyInterpreterState_Get PyInterpreterState_Get
-
-/* An alias for the internal _PyThreadState_New(),
- kept for stable ABI compatibility. */
-PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *);
-
 /* Similar to PyThreadState_Get(), but don't issue a fatal error
  * if it is NULL. */
 PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void);
 
-PyAPI_FUNC(PyObject *) _PyThreadState_GetDict(PyThreadState *tstate);
-
 // Disable tracing and profiling.
 PyAPI_FUNC(void) PyThreadState_EnterTracing(PyThreadState *tstate);
 
@@ -295,19 +284,9 @@ PyAPI_FUNC(int) PyGILState_Check(void);
  This function doesn't check for error. Return NULL before _PyGILState_Init()
  is called and after _PyGILState_Fini() is called.
 
- See also _PyInterpreterState_Get() and _PyInterpreterState_GET(). */
+ See also PyInterpreterState_Get() and _PyInterpreterState_GET(). */
 PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void);
 
-/* The implementation of sys._current_frames() Returns a dict mapping
- thread id to that thread's current frame.
-*/
-PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void);
-
-/* The implementation of sys._current_exceptions() Returns a dict mapping
- thread id to that thread's current exception.
-*/
-PyAPI_FUNC(PyObject *) _PyThread_CurrentExceptions(void);
-
 /* Routines for advanced debuggers, requested by David Beazley.
  Don't use unless you know what you are doing! */
 PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Main(void);
@@ -327,45 +306,6 @@ PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc(
  PyInterpreterState *interp,
  _PyFrameEvalFunction eval_frame);
 
-PyAPI_FUNC(const PyConfig*) _PyInterpreterState_GetConfig(PyInterpreterState *interp);
-
-/* Get a copy of the current interpreter configuration.
-
- Return 0 on success. Raise an exception and return -1 on error.
-
- The caller must initialize 'config', using PyConfig_InitPythonConfig()
- for example.
-
- Python must be preinitialized to call this method.
- The caller must hold the GIL.
-
- Once done with the configuration, PyConfig_Clear() must be called to clear
- it. */
-PyAPI_FUNC(int) _PyInterpreterState_GetConfigCopy(
- struct PyConfig *config);
-
-/* Set the configuration of the current interpreter.
-
- This function should be called during or just after the Python
- initialization.
-
- Update the sys module with the new configuration. If the sys module was
- modified directly after the Python initialization, these changes are lost.
-
- Some configuration like faulthandler or warnoptions can be updated in the
- configuration, but don't reconfigure Python (don't enable/disable
- faulthandler and don't reconfigure warnings filters).
-
- Return 0 on success. Raise an exception and return -1 on error.
-
- The configuration should come from _PyInterpreterState_GetConfigCopy(). */
-PyAPI_FUNC(int) _PyInterpreterState_SetConfig(
- const struct PyConfig *config);
-
-// Get the configuration of the current interpreter.
-// The caller must hold the GIL.
-PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
-
 
 /* cross-interpreter data */