Skip to content

Commit 6a6f734

Browse files
authored
Merge branch 'main' into pep750-concat-update
2 parents 860caea + 61dd9fd commit 6a6f734

File tree

6 files changed

+877
-650
lines changed

6 files changed

+877
-650
lines changed

Android/android.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def unpack_deps(host, prefix_dir):
175175
os.chdir(prefix_dir)
176176
deps_url = "https://github.com/beeware/cpython-android-source-deps/releases/download"
177177
for name_ver in ["bzip2-1.0.8-3", "libffi-3.4.4-3", "openssl-3.0.15-4",
178-
"sqlite-3.49.1-0", "xz-5.4.6-1"]:
178+
"sqlite-3.49.1-0", "xz-5.4.6-1", "zstd-1.5.7-1"]:
179179
filename = f"{name_ver}-{host}.tar.gz"
180180
download(f"{deps_url}/{name_ver}/{filename}")
181181
shutil.unpack_archive(filename)

Doc/library/time.rst

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,11 @@ Functions
306306
.. versionadded:: 3.3
307307

308308
.. versionchanged:: 3.5
309-
The function is now always available and always system-wide.
309+
The function is now always available and the clock is now the same for
310+
all processes.
310311

311312
.. versionchanged:: 3.10
312-
On macOS, the function is now system-wide.
313+
On macOS, the clock is now the same for all processes.
313314

314315

315316
.. function:: monotonic_ns() -> int
@@ -325,7 +326,8 @@ Functions
325326

326327
Return the value (in fractional seconds) of a performance counter, i.e. a
327328
clock with the highest available resolution to measure a short duration. It
328-
does include time elapsed during sleep and is system-wide. The reference
329+
does include time elapsed during sleep. The clock is the same for all
330+
processes. The reference
329331
point of the returned value is undefined, so that only the difference between
330332
the results of two calls is valid.
331333

@@ -340,7 +342,7 @@ Functions
340342
.. versionadded:: 3.3
341343

342344
.. versionchanged:: 3.10
343-
On Windows, the function is now system-wide.
345+
On Windows, the clock is now the same for all processes.
344346

345347
.. versionchanged:: 3.13
346348
Use the same clock as :func:`time.monotonic`.
@@ -987,8 +989,8 @@ The following constant is the only parameter that can be sent to
987989

988990
.. data:: CLOCK_REALTIME
989991

990-
System-wide real-time clock. Setting this clock requires appropriate
991-
privileges.
992+
Real-time clock. Setting this clock requires appropriate privileges.
993+
The clock is the same for all processes.
992994

993995
.. availability:: Unix.
994996

0 commit comments

Comments
 (0)