https://github.com/python/cpython/commit/085b291748cb6edb12f39c7e9baaf207dac9c80d
commit: 085b291748cb6edb12f39c7e9baaf207dac9c80d
branch: main
author: Inada Naoki <[email protected]>
committer: methane <[email protected]>
date: 2026-10-27T18:47:20+09:00
summary:
Docs: Fix indentation that produced unintended definition lists and block
quotes (#160740)
* Fix documentation markup for translation
* Fix more documentation markup for translation
files:
M Doc/c-api/call.rst
M Doc/howto/functional.rst
M Doc/library/asyncio-eventloop.rst
M Doc/library/fractions.rst
M Doc/library/time.rst
M Doc/library/tkinter.font.rst
M Doc/library/unittest.rst
M Doc/library/xml.etree.elementtree.rst
M Doc/whatsnew/2.2.rst
M Doc/whatsnew/2.4.rst
M Doc/whatsnew/3.12.rst
diff --git a/Doc/c-api/call.rst b/Doc/c-api/call.rst
index 9838879a528934a..101318597723c9e 100644
--- a/Doc/c-api/call.rst
+++ b/Doc/c-api/call.rst
@@ -81,17 +81,17 @@ This is a pointer to a function with the following
signature:
- *callable* is the object being called.
- *args* is a C array consisting of the positional arguments followed by the
- values of the keyword arguments.
- This can be *NULL* if there are no arguments.
+ values of the keyword arguments.
+ This can be *NULL* if there are no arguments.
- *nargsf* is the number of positional arguments plus possibly the
- :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
- To get the actual number of positional arguments from *nargsf*,
- use :c:func:`PyVectorcall_NARGS`.
+ :c:macro:`PY_VECTORCALL_ARGUMENTS_OFFSET` flag.
+ To get the actual number of positional arguments from *nargsf*,
+ use :c:func:`PyVectorcall_NARGS`.
- *kwnames* is a tuple containing the names of the keyword arguments;
- in other words, the keys of the kwargs dict.
- These names must be strings (instances of ``str`` or a subclass)
- and they must be unique.
- If there are no keyword arguments, then *kwnames* can instead be *NULL*.
+ in other words, the keys of the kwargs dict.
+ These names must be strings (instances of ``str`` or a subclass)
+ and they must be unique.
+ If there are no keyword arguments, then *kwnames* can instead be *NULL*.
.. c:macro:: PY_VECTORCALL_ARGUMENTS_OFFSET
diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index f2ff5edeb733d7f..8e1a8ce4cc6f344 100644
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -628,7 +628,7 @@ Two of Python's built-in functions, :func:`map` and
:func:`filter` duplicate the
features of generator expressions:
:func:`map(f, iterA, iterB, ...) <map>` returns an iterator over the sequence
- ``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``.
+``f(iterA[0], iterB[0]), f(iterA[1], iterB[1]), f(iterA[2], iterB[2]), ...``.
>>> def upper(s):
... return s.upper()
diff --git a/Doc/library/asyncio-eventloop.rst
b/Doc/library/asyncio-eventloop.rst
index 169018372a334ea..cae09bfae699abd 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -1537,7 +1537,7 @@ Allows customizing how exceptions are handled in the
event loop.
* 'source_traceback' (optional): Traceback of the source;
* 'handle_traceback' (optional): Traceback of the handle;
* 'asyncgen' (optional): Asynchronous generator that caused
- the exception.
+ the exception.
.. note::
diff --git a/Doc/library/fractions.rst b/Doc/library/fractions.rst
index b02e7b5b641136d..1672504304b1ed6 100644
--- a/Doc/library/fractions.rst
+++ b/Doc/library/fractions.rst
@@ -106,7 +106,7 @@ a single number, or from a string.
.. versionchanged:: 3.12
:class:`Fraction` instances now support float-style formatting, with
presentation types ``"e"``, ``"E"``, ``"f"``, ``"F"``, ``"g"``, ``"G"``
- and ``"%""``.
+ and ``"%"``.
.. versionchanged:: 3.13
Formatting of :class:`Fraction` instances without a presentation type
diff --git a/Doc/library/time.rst b/Doc/library/time.rst
index d7ca0628c662ea0..992122e8e8e80bb 100644
--- a/Doc/library/time.rst
+++ b/Doc/library/time.rst
@@ -486,7 +486,7 @@ Functions
| | | |
+-----------+------------------------------------------------+-------+
| ``%f`` | Microseconds as a decimal number | \(1) |
- | | [000000,999999]. | |
+ | | [000000,999999]. | |
| | | |
+-----------+------------------------------------------------+-------+
| ``%H`` | Hour (24-hour clock) as a decimal number | |
diff --git a/Doc/library/tkinter.font.rst b/Doc/library/tkinter.font.rst
index 4c11964183b7d9f..3bdcc76a8526290 100644
--- a/Doc/library/tkinter.font.rst
+++ b/Doc/library/tkinter.font.rst
@@ -120,13 +120,13 @@ The different font weights and slants are:
Options include:
*ascent* - distance between baseline and highest point that a
- character of the font can occupy
+ character of the font can occupy
*descent* - distance between baseline and lowest point that a
- character of the font can occupy
+ character of the font can occupy
*linespace* - minimum vertical separation necessary between any two
- characters of the font that ensures no vertical overlap between lines.
+ characters of the font that ensures no vertical overlap between lines.
*fixed* - 1 if font is fixed-width else 0
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 2b7eeb3624b3a74..f56ba9014a8bb1d 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1001,7 +1001,7 @@ Test cases
| <TestCase.assertLogs>` | with minimum
*level* | |
+---------------------------------------------------------+--------------------------------------+------------+
| :meth:`assertNoLogs(logger, level) | The ``with``
block does not log on | 3.10 |
- | <TestCase.assertNoLogs>` | *logger* with
minimum *level* | |
+ | <TestCase.assertNoLogs>` | *logger* with
minimum *level* | |
+---------------------------------------------------------+--------------------------------------+------------+
.. method:: assertRaises(exception, callable, *args, **kwds)
diff --git a/Doc/library/xml.etree.elementtree.rst
b/Doc/library/xml.etree.elementtree.rst
index c724dee47465b23..7520466f525e61e 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -561,13 +561,13 @@ Functions
- *with_comments*: set to true to include comments (default: false)
- *strip_text*: set to true to strip whitespace before and after text
content
- (default: false)
+ (default: false)
- *rewrite_prefixes*: set to true to replace namespace prefixes by
"n{number}"
- (default: false)
+ (default: false)
- *qname_aware_tags*: a set of qname aware tag names in which prefixes
- should be replaced in text content (default: empty)
+ should be replaced in text content (default: empty)
- *qname_aware_attrs*: a set of qname aware attribute names in which
prefixes
- should be replaced in text content (default: empty)
+ should be replaced in text content (default: empty)
- *exclude_attrs*: a set of attribute names that should not be serialised
- *exclude_tags*: a set of tag names that should not be serialised
diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index 856be5ecfa56ad3..5c69e473af6d5b5 100644
--- a/Doc/whatsnew/2.2.rst
+++ b/Doc/whatsnew/2.2.rst
@@ -1082,7 +1082,7 @@ code, none of the changes described here will affect you
very much.
* Rename :c:macro:`!Py_TPFLAGS_GC` to :c:macro:`Py_TPFLAGS_HAVE_GC`.
* Use :c:func:`PyObject_GC_New` or :c:func:`PyObject_GC_NewVar` to allocate
- objects, and :c:func:`PyObject_GC_Del` to deallocate them.
+ objects, and :c:func:`PyObject_GC_Del` to deallocate them.
* Rename :c:func:`!PyObject_GC_Init` to :c:func:`PyObject_GC_Track` and
:c:func:`!PyObject_GC_Fini` to :c:func:`PyObject_GC_UnTrack`.
diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index 87c7b6b17477b50..ae3e9ed4646eeda 100644
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -1015,8 +1015,8 @@ complete list of changes, or look through the CVS logs
for all the details.
* Chinese (ROC): big5, cp950
* Japanese: cp932, euc-jis-2004, euc-jp, euc-jisx0213, iso-2022-jp,
- iso-2022-jp-1, iso-2022-jp-2, iso-2022-jp-3, iso-2022-jp-ext,
iso-2022-jp-2004,
- shift-jis, shift-jisx0213, shift-jis-2004
+ iso-2022-jp-1, iso-2022-jp-2, iso-2022-jp-3, iso-2022-jp-ext,
iso-2022-jp-2004,
+ shift-jis, shift-jisx0213, shift-jis-2004
* Korean: cp949, euc-kr, johab, iso-2022-kr
diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 78ddc627fcf4d70..d822d83164db6ff 100644
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -1995,17 +1995,17 @@ New Features
to bypass reference counts, and related changes to the C-API:
- ``_Py_IMMORTAL_REFCNT``: The reference count that defines an object
- as immortal.
+ as immortal.
- ``_Py_IsImmortal`` Checks if an object has the immortal reference count.
- ``PyObject_HEAD_INIT`` This will now initialize reference count to
- ``_Py_IMMORTAL_REFCNT`` when used with ``Py_BUILD_CORE``.
+ ``_Py_IMMORTAL_REFCNT`` when used with ``Py_BUILD_CORE``.
- ``SSTATE_INTERNED_IMMORTAL`` An identifier for interned unicode objects
- that are immortal.
+ that are immortal.
- ``SSTATE_INTERNED_IMMORTAL_STATIC`` An identifier for interned unicode
- objects that are immortal and static
+ objects that are immortal and static
- ``sys.getunicodeinternedsize`` This returns the total number of unicode
- objects that have been interned. This is now needed for
:file:`refleak.py` to
- correctly track reference counts and allocated blocks
+ objects that have been interned. This is now needed for :file:`refleak.py`
to
+ correctly track reference counts and allocated blocks
(Contributed by Eddie Elizondo in :gh:`84436`.)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
