Skip to content

Commit ae52e74

Browse files
authored
Merge branch '3.14' into backport-3c1471d-3.14
2 parents 39b4350 + ab7ffdc commit ae52e74

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Doc/whatsnew/3.14.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ math
16971697
----
16981698

16991699
* Added more detailed error messages for domain errors in the module.
1700-
(Contributed by by Charlie Zhao and Sergey B Kirpichev in :gh:`101410`.)
1700+
(Contributed by Charlie Zhao and Sergey B Kirpichev in :gh:`101410`.)
17011701

17021702

17031703
mimetypes
@@ -3034,7 +3034,6 @@ Porting to Python 3.14
30343034
* ``_PyLong_IsPositive()``: :c:func:`PyLong_IsPositive`
30353035
* ``_PyLong_IsZero()``: :c:func:`PyLong_IsZero`
30363036
* ``_PyLong_Sign()``: :c:func:`PyLong_GetSign`
3037-
* ``_PyMutex_IsLocked()`` : :c:func:`PyMutex_IsLocked`
30383037
* ``_PyUnicodeWriter_Dealloc()``: :c:func:`PyUnicodeWriter_Discard`
30393038
* ``_PyUnicodeWriter_Finish()``: :c:func:`PyUnicodeWriter_Finish`
30403039
* ``_PyUnicodeWriter_Init()``: use :c:func:`PyUnicodeWriter_Create`
@@ -3048,6 +3047,7 @@ Porting to Python 3.14
30483047
* ``_Py_GetConfig()``: :c:func:`PyConfig_Get` and :c:func:`PyConfig_GetInt`
30493048
* ``_Py_HashBytes()``: :c:func:`Py_HashBuffer`
30503049
* ``_Py_fopen_obj()``: :c:func:`Py_fopen`
3050+
* ``PyMutex_IsLocked()`` : :c:func:`PyMutex_IsLocked`
30513051

30523052
The `pythoncapi-compat project`_ can be used to get most of these new
30533053
functions on Python 3.13 and older.

Modules/_zstd/decompressor.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,7 @@ _zstd_load_impl(ZstdDecompressor *self, ZstdDict *zd,
157157
zd->dict_len);
158158
}
159159
else {
160-
/* Impossible code path */
161-
PyErr_SetString(PyExc_SystemError,
162-
"load_d_dict() impossible code path");
163-
return -1;
160+
Py_UNREACHABLE();
164161
}
165162

166163
/* Check error */

0 commit comments

Comments
 (0)