Skip to content

Commit 234a101

Browse files
authored
Merge branch 'main' into fix-typo-in-configure-file
2 parents 672aa16 + 9982147 commit 234a101

20 files changed

+1204
-1030
lines changed

Doc/library/os.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4262,7 +4262,7 @@ features:
42624262
import os
42634263

42644264
# semaphore with start value '1'
4265-
fd = os.eventfd(1, os.EFD_SEMAPHORE | os.EFC_CLOEXEC)
4265+
fd = os.eventfd(1, os.EFD_SEMAPHORE | os.EFD_CLOEXEC)
42664266
try:
42674267
# acquire semaphore
42684268
v = os.eventfd_read(fd)

Doc/whatsnew/3.15.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ math
603603
mimetypes
604604
---------
605605

606+
* Add ``application/dicom`` MIME type for ``.dcm`` extension. (Contributed by Benedikt Johannes in :gh:`144217`.)
606607
* Add ``application/node`` MIME type for ``.cjs`` extension. (Contributed by John Franey in :gh:`140937`.)
607608
* Add ``application/toml``. (Contributed by Gil Forcada in :gh:`139959`.)
608609
* Rename ``application/x-texinfo`` to ``application/texinfo``.

Include/internal/pycore_opcode_metadata.h

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)