Merge remote-tracking branch 'upstream/main' into pr/142759

Author: Fidget-Spinner

Doc/whatsnew/3.15.rst

@@ -74,8 +74,6 @@ Summary -- Release highlights
 * :pep:`782`: :ref:`A new PyBytesWriter C API to create a Python bytes object
   <whatsnew315-pep782>`
 * :ref:`Improved error messages <whatsnew315-improved-error-messages>`
-* :ref:`__pycache__ directories now contain a .gitignore file
-  <whatsnew315-pycache-gitignore>`
 
 
 New features
@@ -399,12 +397,6 @@ Other language changes
   for any class.
   (Contributed by Serhiy Storchaka in :gh:`41779`.)
 
-.. _whatsnew315-pycache-gitignore:
-
-* :file:`__pycache__` directories now contain a :file:`.gitignore` file for Git
-  that ignores their contents.
-  (Contributed by Stan Ulbrych in :gh:`141081`.)
-
 
 New modules
 ===========

Include/internal/pycore_ceval.h

@@ -377,8 +377,6 @@ _Py_eval_breaker_bit_is_set(PyThreadState *tstate, uintptr_t bit)
 void _Py_set_eval_breaker_bit_all(PyInterpreterState *interp, uintptr_t bit);
 void _Py_unset_eval_breaker_bit_all(PyInterpreterState *interp, uintptr_t bit);
 
-PyAPI_FUNC(_PyStackRef) _PyFloat_FromDouble_ConsumeInputs(_PyStackRef left, _PyStackRef right, double value);
-
 #ifndef Py_SUPPORTS_REMOTE_DEBUG
     #if defined(__APPLE__)
     #include <TargetConditionals.h>

Include/internal/pycore_object.h

@@ -496,6 +496,9 @@ static inline void Py_DECREF_MORTAL_SPECIALIZED(PyObject *op, destructor destruc
 #define Py_DECREF_MORTAL_SPECIALIZED(op, destruct) Py_DECREF_MORTAL_SPECIALIZED(_PyObject_CAST(op), destruct)
 
 #endif
+#else  // Py_GIL_DISABLED
+# define Py_DECREF_MORTAL(op) Py_DECREF(op)
+# define Py_DECREF_MORTAL_SPECIALIZED(op, destruct) Py_DECREF(op)
 #endif
 
 /* Inline functions trading binary compatibility for speed:
@@ -1045,6 +1048,8 @@ static inline Py_ALWAYS_INLINE void _Py_INCREF_MORTAL(PyObject *op)
     }
 #endif
 }
+#else
+# define _Py_INCREF_MORTAL(op) Py_INCREF(op)
 #endif
 
 /* Utility for the tp_traverse slot of mutable heap types that have no other