Skip to content

Commit 0d25f98

Browse files
generatedunixname1734921407115435meta-codesync[bot]
authored andcommitted
Import CPython 3.14.6+ stable branch (2026-07-17)
Summary: Imported python/cpython `3.14.6+` from upstream rev [`890bd0e`](https://www.github.com/python/cpython/commit/890bd0ed9130c8baa1e5a29fcfac266b1504889e) (committed 2026-07-17 02:50:00+00:00). # Commit Info - Base: (`3.14.6+`) - [`9b33b25`](https://www.github.com/python/cpython/commit/9b33b258aa582f18439acb4e9a36e4e755ab106a) (commit date: 2026-07-15 18:13:38+00:00) - Imported: (`3.14.6+`) - [`890bd0e`](https://www.github.com/python/cpython/commit/890bd0ed9130c8baa1e5a29fcfac266b1504889e) (commit date: 2026-07-17 02:50:00+00:00) # Noteworthy file changes - Low-signal files (1 added) (NEWS.d, docs, .github) Complete list of added/removed files: https://www.internalfb.com/intern/everpaste/?color=0&handle=GOoduSR6rh-Wz8YDAELdSg7YGjwZbr0LAAAz Reviewed By: KasraGhodsi Differential Revision: D112527225 fbshipit-source-id: 56d46ebcf67fb68456e1c3779dff15f8e88a7dc3
1 parent 000903c commit 0d25f98

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

Doc/library/typing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2099,7 +2099,7 @@ without the dedicated syntax, as documented below.
20992099

21002100
Support for default values was added.
21012101

2102-
.. class:: ParamSpec(name, *, bound=None, covariant=False, contravariant=False, default=typing.NoDefault)
2102+
.. class:: ParamSpec(name, *, bound=None, covariant=False, contravariant=False, infer_variance=False, default=typing.NoDefault)
21032103

21042104
Parameter specification variable. A specialized version of
21052105
:ref:`type variables <typevar>`.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix a potential deadlock in :c:func:`PyUnicode_InternFromString` and other
2+
interning functions in the :term:`free-threaded build` when called from C++
3+
static local initializers.

Objects/unicodeobject.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ NOTE: In the interpreter's initialization phase, some globals are currently
113113
#endif
114114

115115
#ifdef Py_GIL_DISABLED
116-
# define LOCK_INTERNED(interp) PyMutex_Lock(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex))
116+
# define LOCK_INTERNED(interp) \
117+
PyMutex_LockFlags(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex), \
118+
_Py_LOCK_DONT_DETACH)
117119
# define UNLOCK_INTERNED(interp) PyMutex_Unlock(&_Py_INTERP_CACHED_OBJECT(interp, interned_mutex))
118120
#else
119121
# define LOCK_INTERNED(interp)

0 commit comments

Comments
 (0)