Skip to content

Commit 21a576a

Browse files
authored
Merge branch 'main' into tp_finalize_doc
2 parents 6125f07 + 55815a6 commit 21a576a

File tree

340 files changed

+22465
-15244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

340 files changed

+22465
-15244
lines changed

Doc/c-api/init_config.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,10 @@ Configuration Options
505505
- :c:member:`use_hash_seed <PyConfig.use_hash_seed>`
506506
- ``bool``
507507
- Read-only
508+
* - ``"use_system_logger"``
509+
- :c:member:`use_system_logger <PyConfig.use_system_logger>`
510+
- ``bool``
511+
- Read-only
508512
* - ``"user_site_directory"``
509513
- :c:member:`user_site_directory <PyConfig.user_site_directory>`
510514
- ``bool``
@@ -1927,9 +1931,10 @@ PyConfig
19271931
19281932
Only available on macOS 10.12 and later, and on iOS.
19291933
1930-
Default: ``0`` (don't use system log).
1934+
Default: ``0`` (don't use the system log) on macOS; ``1`` on iOS (use the
1935+
system log).
19311936
1932-
.. versionadded:: 3.13.2
1937+
.. versionadded:: 3.14
19331938
19341939
.. c:member:: int user_site_directory
19351940

Doc/c-api/typeobj.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
.. _type-structs:
44

5-
Type Objects
6-
============
5+
Type Object Structures
6+
======================
77

88
Perhaps one of the most important structures of the Python object system is the
99
structure that defines a new type: the :c:type:`PyTypeObject` structure. Type

Doc/c-api/unicode.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,7 @@ The following API is deprecated.
18681868
18691869
.. versionadded:: 3.3
18701870
1871-
.. deprecated:: next
1871+
.. deprecated:: 3.14
18721872
This API does nothing since Python 3.12.
18731873
Previously, this could be called to check if
18741874
:c:func:`PyUnicode_READY` is necessary.

Doc/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
'issue_role',
3434
'lexers',
3535
'misc_news',
36-
'pydoc_topics',
3736
'pyspecific',
3837
'sphinx.ext.coverage',
3938
'sphinx.ext.doctest',

Doc/data/stable_abi.dat

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

Doc/deprecations/pending-removal-in-3.15.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Pending removal in Python 3.15
5757

5858
* :mod:`sysconfig`:
5959

60-
* The ``check_home`` argument of :func:`sysconfig.is_python_build` has been
60+
* The *check_home* argument of :func:`sysconfig.is_python_build` has been
6161
deprecated since Python 3.12.
6262

6363
* :mod:`threading`:

Doc/deprecations/pending-removal-in-future.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ although there is currently no date scheduled for their removal.
111111
* ``ssl.TLSVersion.TLSv1``
112112
* ``ssl.TLSVersion.TLSv1_1``
113113

114-
* :func:`sysconfig.is_python_build` *check_home* parameter is deprecated and
115-
ignored.
116-
117114
* :mod:`threading` methods:
118115

119116
* :meth:`!threading.Condition.notifyAll`: use :meth:`~threading.Condition.notify_all`.

Doc/library/cmdline.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ The following modules have a command-line interface.
1111
* :mod:`code`
1212
* :ref:`compileall <compileall-cli>`
1313
* :mod:`cProfile`: see :ref:`profile <profile-cli>`
14-
* :ref:`difflib <difflib-interface>`
1514
* :ref:`dis <dis-cli>`
1615
* :mod:`doctest`
1716
* :mod:`!encodings.rot_13`
@@ -24,9 +23,9 @@ The following modules have a command-line interface.
2423
* :mod:`!idlelib`
2524
* :ref:`inspect <inspect-module-cli>`
2625
* :ref:`json <json-commandline>`
27-
* :mod:`mimetypes`
26+
* :ref:`mimetypes <mimetypes-cli>`
2827
* :mod:`pdb`
29-
* :mod:`pickle`
28+
* :ref:`pickle <pickle-cli>`
3029
* :ref:`pickletools <pickletools-cli>`
3130
* :mod:`platform`
3231
* :mod:`poplib`

Doc/library/concurrent.futures.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ Executor Objects
4040
future = executor.submit(pow, 323, 1235)
4141
print(future.result())
4242

43-
.. method:: map(fn, *iterables, timeout=None, chunksize=1)
43+
.. method:: map(fn, *iterables, timeout=None, chunksize=1, buffersize=None)
4444

4545
Similar to :func:`map(fn, *iterables) <map>` except:
4646

47-
* the *iterables* are collected immediately rather than lazily;
47+
* The *iterables* are collected immediately rather than lazily, unless a
48+
*buffersize* is specified to limit the number of submitted tasks whose
49+
results have not yet been yielded. If the buffer is full, iteration over
50+
the *iterables* pauses until a result is yielded from the buffer.
4851

4952
* *fn* is executed asynchronously and several calls to
5053
*fn* may be made concurrently.
@@ -68,7 +71,10 @@ Executor Objects
6871
*chunksize* has no effect.
6972

7073
.. versionchanged:: 3.5
71-
Added the *chunksize* argument.
74+
Added the *chunksize* parameter.
75+
76+
.. versionchanged:: 3.14
77+
Added the *buffersize* parameter.
7278

7379
.. method:: shutdown(wait=True, *, cancel_futures=False)
7480

@@ -425,7 +431,7 @@ to a :class:`ProcessPoolExecutor` will result in deadlock.
425431
After calling this method the caller should no longer submit tasks to the
426432
executor.
427433

428-
.. versionadded:: next
434+
.. versionadded:: 3.14
429435

430436
.. method:: kill_workers()
431437

@@ -437,7 +443,7 @@ to a :class:`ProcessPoolExecutor` will result in deadlock.
437443
After calling this method the caller should no longer submit tasks to the
438444
executor.
439445

440-
.. versionadded:: next
446+
.. versionadded:: 3.14
441447

442448
.. _processpoolexecutor-example:
443449

Doc/library/contextvars.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Context Variables
112112

113113
assert var.get() == 'default value'
114114

115-
.. versionadded:: next
115+
.. versionadded:: 3.14
116116

117117
Added support for usage as a context manager.
118118

0 commit comments

Comments
 (0)