Skip to content

Commit 7d5a982

Browse files
authored
[3.12] gh-110631: Fix reST indentation (GH-110724) (#110738)
* Fix wrong indentation in the other dirs. * Fix more wrong indentation.. (cherry picked from commit 718391f)
1 parent cae968b commit 7d5a982

File tree

7 files changed

+51
-53
lines changed

7 files changed

+51
-53
lines changed

Doc/c-api/memory.rst

+12-12
Original file line numberDiff line numberDiff line change
@@ -491,18 +491,18 @@ Customize Memory Allocators
491491
492492
:c:func:`PyMem_SetAllocator` does have the following contract:
493493
494-
* It can be called after :c:func:`Py_PreInitialize` and before
495-
:c:func:`Py_InitializeFromConfig` to install a custom memory
496-
allocator. There are no restrictions over the installed allocator
497-
other than the ones imposed by the domain (for instance, the Raw
498-
Domain allows the allocator to be called without the GIL held). See
499-
:ref:`the section on allocator domains <allocator-domains>` for more
500-
information.
501-
502-
* If called after Python has finish initializing (after
503-
:c:func:`Py_InitializeFromConfig` has been called) the allocator
504-
**must** wrap the existing allocator. Substituting the current
505-
allocator for some other arbitrary one is **not supported**.
494+
* It can be called after :c:func:`Py_PreInitialize` and before
495+
:c:func:`Py_InitializeFromConfig` to install a custom memory
496+
allocator. There are no restrictions over the installed allocator
497+
other than the ones imposed by the domain (for instance, the Raw
498+
Domain allows the allocator to be called without the GIL held). See
499+
:ref:`the section on allocator domains <allocator-domains>` for more
500+
information.
501+
502+
* If called after Python has finish initializing (after
503+
:c:func:`Py_InitializeFromConfig` has been called) the allocator
504+
**must** wrap the existing allocator. Substituting the current
505+
allocator for some other arbitrary one is **not supported**.
506506
507507
.. versionchanged:: 3.12
508508
All allocators must be thread-safe.

Doc/howto/enum.rst

+8-7
Original file line numberDiff line numberDiff line change
@@ -1156,13 +1156,14 @@ the following are true:
11561156
There is a new boundary mechanism that controls how out-of-range / invalid
11571157
bits are handled: ``STRICT``, ``CONFORM``, ``EJECT``, and ``KEEP``:
11581158

1159-
* STRICT --> raises an exception when presented with invalid values
1160-
* CONFORM --> discards any invalid bits
1161-
* EJECT --> lose Flag status and become a normal int with the given value
1162-
* KEEP --> keep the extra bits
1163-
- keeps Flag status and extra bits
1164-
- extra bits do not show up in iteration
1165-
- extra bits do show up in repr() and str()
1159+
* STRICT --> raises an exception when presented with invalid values
1160+
* CONFORM --> discards any invalid bits
1161+
* EJECT --> lose Flag status and become a normal int with the given value
1162+
* KEEP --> keep the extra bits
1163+
1164+
- keeps Flag status and extra bits
1165+
- extra bits do not show up in iteration
1166+
- extra bits do show up in repr() and str()
11661167

11671168
The default for Flag is ``STRICT``, the default for ``IntFlag`` is ``EJECT``,
11681169
and the default for ``_convert_`` is ``KEEP`` (see ``ssl.Options`` for an

Doc/howto/instrumentation.rst

+6-8
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ DTrace and SystemTap are monitoring tools, each providing a way to inspect
1313
what the processes on a computer system are doing. They both use
1414
domain-specific languages allowing a user to write scripts which:
1515

16-
- filter which processes are to be observed
17-
- gather data from the processes of interest
18-
- generate reports on the data
16+
- filter which processes are to be observed
17+
- gather data from the processes of interest
18+
- generate reports on the data
1919

2020
As of Python 3.6, CPython can be built with embedded "markers", also
2121
known as "probes", that can be observed by a DTrace or SystemTap script,
@@ -246,11 +246,9 @@ The output looks like this:
246246
247247
where the columns are:
248248

249-
- time in microseconds since start of script
250-
251-
- name of executable
252-
253-
- PID of process
249+
- time in microseconds since start of script
250+
- name of executable
251+
- PID of process
254252

255253
and the remainder indicates the call/return hierarchy as the script executes.
256254

Doc/library/csv.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ The :mod:`csv` module defines the following classes:
288288
Inspecting each column, one of two key criteria will be considered to
289289
estimate if the sample contains a header:
290290

291-
- the second through n-th rows contain numeric values
292-
- the second through n-th rows contain strings where at least one value's
293-
length differs from that of the putative header of that column.
291+
- the second through n-th rows contain numeric values
292+
- the second through n-th rows contain strings where at least one value's
293+
length differs from that of the putative header of that column.
294294

295295
Twenty rows after the first row are sampled; if more than half of columns +
296296
rows meet the criteria, :const:`True` is returned.

Doc/library/dataclasses.rst

+5-7
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,11 @@ Module contents
319319
module-level method (see below). Users should never instantiate a
320320
:class:`Field` object directly. Its documented attributes are:
321321

322-
- ``name``: The name of the field.
323-
324-
- ``type``: The type of the field.
325-
326-
- ``default``, ``default_factory``, ``init``, ``repr``, ``hash``,
327-
``compare``, ``metadata``, and ``kw_only`` have the identical
328-
meaning and values as they do in the :func:`field` function.
322+
- ``name``: The name of the field.
323+
- ``type``: The type of the field.
324+
- ``default``, ``default_factory``, ``init``, ``repr``, ``hash``,
325+
``compare``, ``metadata``, and ``kw_only`` have the identical
326+
meaning and values as they do in the :func:`field` function.
329327

330328
Other attributes may exist, but they are private and must not be
331329
inspected or relied on.

Doc/library/decimal.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -1396,10 +1396,10 @@ In addition to the three supplied contexts, new contexts can be created with the
13961396
With three arguments, compute ``(x**y) % modulo``. For the three argument
13971397
form, the following restrictions on the arguments hold:
13981398

1399-
- all three arguments must be integral
1400-
- ``y`` must be nonnegative
1401-
- at least one of ``x`` or ``y`` must be nonzero
1402-
- ``modulo`` must be nonzero and have at most 'precision' digits
1399+
- all three arguments must be integral
1400+
- ``y`` must be nonnegative
1401+
- at least one of ``x`` or ``y`` must be nonzero
1402+
- ``modulo`` must be nonzero and have at most 'precision' digits
14031403

14041404
The value resulting from ``Context.power(x, y, modulo)`` is
14051405
equal to the value that would be obtained by computing ``(x**y)

Doc/using/windows.rst

+13-12
Original file line numberDiff line numberDiff line change
@@ -1187,21 +1187,22 @@ Otherwise, your users may experience problems using your application. Note that
11871187
the first suggestion is the best, as the others may still be susceptible to
11881188
non-standard paths in the registry and user site-packages.
11891189

1190-
.. versionchanged::
1191-
3.6
1190+
.. versionchanged:: 3.6
1191+
1192+
Add ``._pth`` file support and removes ``applocal`` option from
1193+
``pyvenv.cfg``.
1194+
1195+
.. versionchanged:: 3.6
11921196

1193-
* Adds ``._pth`` file support and removes ``applocal`` option from
1194-
``pyvenv.cfg``.
1195-
* Adds :file:`python{XX}.zip` as a potential landmark when directly adjacent
1196-
to the executable.
1197+
Add :file:`python{XX}.zip` as a potential landmark when directly adjacent
1198+
to the executable.
11971199

1198-
.. deprecated::
1199-
3.6
1200+
.. deprecated:: 3.6
12001201

1201-
Modules specified in the registry under ``Modules`` (not ``PythonPath``)
1202-
may be imported by :class:`importlib.machinery.WindowsRegistryFinder`.
1203-
This finder is enabled on Windows in 3.6.0 and earlier, but may need to
1204-
be explicitly added to :data:`sys.meta_path` in the future.
1202+
Modules specified in the registry under ``Modules`` (not ``PythonPath``)
1203+
may be imported by :class:`importlib.machinery.WindowsRegistryFinder`.
1204+
This finder is enabled on Windows in 3.6.0 and earlier, but may need to
1205+
be explicitly added to :data:`sys.meta_path` in the future.
12051206

12061207
Additional modules
12071208
==================

0 commit comments

Comments
 (0)