Re-sync with internal repository

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.

fbshipit-source-id: 749e0725b2b28c4649cd342fc9f9e7b43b0fc093

Author: facebook-github-bot

.github/workflows/mypy.yml

@@ -69,11 +69,12 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
+      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
           python-version: "3.15"
-          activate-environment: true
-          cache-dependency-glob: Tools/requirements-dev.txt
-      - run: uv pip install -r Tools/requirements-dev.txt
+          allow-prereleases: true
+          cache: pip
+          cache-dependency-path: Tools/requirements-dev.txt
+      - run: pip install -r Tools/requirements-dev.txt
       - run: python3 Misc/mypy/make_symlinks.py --symlink
-      - run: mypy --num-workers 4 --config-file ${{ matrix.target }}/mypy.ini
+      - run: mypy --config-file ${{ matrix.target }}/mypy.ini

Doc/c-api/sentinel.rst

@@ -14,20 +14,8 @@ Sentinel objects
 
 .. c:function:: int PySentinel_Check(PyObject *o)
 
-   Return true if *o* is a :class:`sentinel` object or a subtype.
-   The :class:`sentinel` type does not currently allow subclasses,
-   so this check is exact.
-   Future Python versions may choose to allow subtyping.
-   This function always succeeds.
-
-   .. versionadded:: 3.15
-
-.. c:function:: int PySentinel_CheckExact(PyObject *o)
-
-   Return true if *o* is a :class:`sentinel` object, but not a subtype.
-   The :class:`sentinel` type does not currently allow subclasses.
-   Future Python versions may choose to allow subtyping.
-   This function always succeeds.
+   Return true if *o* is a :class:`sentinel` object.  The :class:`sentinel` type
+   does not allow subclasses, so this check is exact.
 
    .. versionadded:: 3.15
 

Doc/library/mimetypes.rst

@@ -315,11 +315,9 @@ than one MIME-type database; it provides an interface similar to the one of the
       When *strict* is ``True`` (the default), the mapping will be added to the
       official MIME types, otherwise to the non-standard ones.
 
-      .. deprecated:: 3.14
-         *ext* values that do not start with ``'.'`` are deprecated.
-
-      .. versionchanged:: next
-         *ext* now must start with ``'.'``. Otherwise :exc:`ValueError` is raised.
+      .. deprecated-removed:: 3.14 3.16
+         Invalid, undotted extensions will raise a
+         :exc:`ValueError` in Python 3.16.
 
 
 .. _mimetypes-cli:

Include/cpython/sentinelobject.h

@@ -1,18 +1,15 @@
 /* Sentinel object interface */
 
 #ifndef Py_LIMITED_API
-#ifndef _Py_SENTINELOBJECT_H
-#define _Py_SENTINELOBJECT_H
+#ifndef Py_SENTINELOBJECT_H
+#define Py_SENTINELOBJECT_H
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 PyAPI_DATA(PyTypeObject) PySentinel_Type;
 
-#define PySentinel_CheckExact(op) Py_IS_TYPE((op), &PySentinel_Type)
-
-/* Alias as long as subclasses are not allowed. */
-#define PySentinel_Check(op) PySentinel_CheckExact(op)
+#define PySentinel_Check(op) Py_IS_TYPE((op), &PySentinel_Type)
 
 PyAPI_FUNC(PyObject *) PySentinel_New(
     const char *name,
@@ -21,5 +18,5 @@ PyAPI_FUNC(PyObject *) PySentinel_New(
 #ifdef __cplusplus
 }
 #endif
-#endif /* !_Py_SENTINELOBJECT_H */
+#endif /* !Py_SENTINELOBJECT_H */
 #endif /* !Py_LIMITED_API */

Include/cpython/sliceobject.h

@@ -1,4 +1,4 @@
-#ifndef _Py_CPYTHON_SLICEOBJECT_H
+#ifndef Py_CPYTHON_SLICEOBJECT_H
 #  error "this header file must not be included directly"
 #endif
 

Include/cpython/structseq.h

@@ -1,4 +1,4 @@
-#ifndef _Py_CPYTHON_STRUCTSEQ_H
+#ifndef Py_CPYTHON_STRUCTSEQ_H
 #  error "this header file must not be included directly"
 #endif
 

Include/internal/pycore_jit_unwind.h

@@ -11,7 +11,7 @@
 #if defined(_Py_JIT) && defined(__linux__) && defined(__ELF__)
 #  define PY_HAVE_JIT_GDB_UNWIND
 #  if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \
-          defined(_Py_HAVE_LIBGCC_EH_FRAME_REGISTRATION)
+          defined(HAVE_LIBGCC_EH_FRAME_REGISTRATION)
 #    define PY_HAVE_JIT_GNU_BACKTRACE_UNWIND
 #  endif
 #endif

Include/internal/pycore_mmap.h

@@ -11,12 +11,12 @@ extern "C" {
 
 #include "pycore_pystate.h"
 
-#if defined(_Py_HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
+#if defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
 #  include <linux/prctl.h>
 #  include <sys/prctl.h>
 #endif
 
-#if defined(_Py_HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
+#if defined(HAVE_PR_SET_VMA_ANON_NAME) && defined(__linux__)
 static inline int
 _PyAnnotateMemoryMap(void *addr, size_t size, const char *name)
 {

Include/sliceobject.h

@@ -45,9 +45,9 @@ PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length,
 #endif
 
 #ifndef Py_LIMITED_API
-#  define _Py_CPYTHON_SLICEOBJECT_H
+#  define Py_CPYTHON_SLICEOBJECT_H
 #  include "cpython/sliceobject.h"
-#  undef _Py_CPYTHON_SLICEOBJECT_H
+#  undef Py_CPYTHON_SLICEOBJECT_H
 #endif
 
 #ifdef __cplusplus

Include/structseq.h

@@ -29,9 +29,9 @@ PyAPI_FUNC(void) PyStructSequence_SetItem(PyObject*, Py_ssize_t, PyObject*);
 PyAPI_FUNC(PyObject*) PyStructSequence_GetItem(PyObject*, Py_ssize_t);
 
 #ifndef Py_LIMITED_API
-#  define _Py_CPYTHON_STRUCTSEQ_H
+#  define Py_CPYTHON_STRUCTSEQ_H
 #  include "cpython/structseq.h"
-#  undef _Py_CPYTHON_STRUCTSEQ_H
+#  undef Py_CPYTHON_STRUCTSEQ_H
 #endif
 
 #ifdef __cplusplus