Skip to content

Commit 499679c

Browse files
Merge branch 'python:main' into patch-4
2 parents 1488055 + 837166f commit 499679c

28 files changed

+622
-194
lines changed

.github/CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,12 @@ Python/jit.c @brandtbucher @savannahostrowski @diegorusso
292292
Tools/jit/ @brandtbucher @savannahostrowski @diegorusso
293293
InternalDocs/jit.md @brandtbucher @savannahostrowski @diegorusso @AA-Turner
294294

295+
# Lazy imports (PEP 810)
296+
Objects/lazyimportobject.c @twouters @DinoV @pablogsal
297+
Include/internal/pycore_lazyimportobject.h @twouters @DinoV @pablogsal
298+
Lib/test/test_import/test_lazy_imports.py @twouters @DinoV @pablogsal
299+
Lib/test/test_import/data/lazy_imports/ @twouters @DinoV @pablogsal
300+
295301
# Micro-op / μop / Tier 2 Optimiser
296302
Python/optimizer.c @markshannon @Fidget-Spinner
297303
Python/optimizer_analysis.c @markshannon @tomasr8 @Fidget-Spinner @savannahostrowski

Android/android.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def make_build_python(context):
208208
def unpack_deps(host, prefix_dir):
209209
os.chdir(prefix_dir)
210210
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
211-
for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.18-0",
211+
for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.19-1",
212212
"sqlite-3.50.4-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
213213
filename = f"{name_ver}-{host}.tar.gz"
214214
download(f"{deps_url}/{name_ver}/{filename}")

Apple/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def unpack_deps(
316316
for name_ver in [
317317
"BZip2-1.0.8-2",
318318
"libFFI-3.4.7-2",
319-
"OpenSSL-3.0.18-1",
319+
"OpenSSL-3.0.19-1",
320320
"XZ-5.6.4-2",
321321
"mpdecimal-4.0.0-2",
322322
"zstd-1.5.7-1",

Doc/c-api/datetime.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ macros.
3030

3131
This is not compatible with subinterpreters.
3232

33+
.. versionchanged:: 3.15
34+
35+
This macro is now thread safe.
36+
3337
.. c:type:: PyDateTime_CAPI
3438
3539
Structure containing the fields for the datetime C API.
@@ -44,6 +48,11 @@ macros.
4448

4549
This variable is only available once :c:macro:`PyDateTime_IMPORT` succeeds.
4650

51+
.. versionchanged:: 3.15
52+
53+
This variable should not be accessed directly as direct access is not thread-safe.
54+
Use :c:func:`PyDateTime_IMPORT` instead.
55+
4756
.. c:type:: PyDateTime_Date
4857
4958
This subtype of :c:type:`PyObject` represents a Python date object.

Doc/library/mailbox.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
7878
message. Failing to lock the mailbox runs the risk of losing messages or
7979
corrupting the entire mailbox.
8080

81+
The :class:`!Mailbox` class supports the :keyword:`with` statement. When used
82+
as a context manager, :class:`!Mailbox` calls :meth:`lock` when the context is entered,
83+
returns the mailbox object as the context object, and at context end calls :meth:`close`,
84+
thereby releasing the lock.
85+
86+
.. versionchanged:: next
87+
Support for the :keyword:`with` statement was added.
88+
8189
:class:`!Mailbox` instances have the following methods:
8290

8391

0 commit comments

Comments
 (0)