8000 Merge branch 'main' of https://github.com/python/cpython into dis_qui… · python/cpython@659d570 · GitHub
[go: up one dir, main page]
Skip to content

Commit 659d570

Browse files
penguin-wwypenguin-wwy
committed
Merge branch 'main' of https://github.com/python/cpython into dis_quickened_code
2 parents e896538 + a96dfbd commit 659d570
  • test_aifc.py
  • test_calendar.py
  • test_compileall.py
  • test_configparser.py
  • test_dis.py
  • test_exceptions.py
  • test_functools.py
  • test_genericalias.py
  • test_getpath.py
  • test_io.py
  • test_os.py
  • test_posix.py
  • test_pyclbr.py
  • test_pydoc.py
  • test_re.py
  • test_site.py
  • test_sqlite3
  • test_subprocess.py
  • test_syntax.py
  • test_typing.py
  • test_unparse.py
  • test_utf8_mode.py
  • test_warnings
  • test_zipfile.py
  • typing.py
  • warnings.py
  • zipfile.py
  • Mac/BuildScript
  • Makefile.pre.in
  • Misc
  • 2022-03-19-15-54-41.bpo-38256.FoMbjE.rst
  • 2022-03-19-19-56-04.bpo-42369.Ok828t.rst
  • 2022-03-20-15-54-41.bpo-28080.kn35Vk.rst
  • 2022-03-20-17-15-56.bpo-47067.XXLnje.rst
  • 2022-03-20-22-13-24.bpo-23691.Nc2TrW.rst
  • 2022-03-21-08-32-19.bpo-42885.LCnTTp.rst
  • 2022-03-23-10-07-41.bpo-47098.7AN_qp.rst
  • 2022-03-23-12-07-26.bpo-47095.P3YTrh.rst
  • 2022-03-23-13-55-41.bpo-47099.P6quRP.rst
  • 2022-03-23-14-16-38.bpo-47099.2raait.rst
  • 2022-03-23-15-31-02.bpo-47101.rVSld-.rst
  • 2022-03-25-01-27-25.bpo-39622.ieBIMp.rst
  • 2022-03-27-10-41-24.bpo-14265.OBMlAi.rst
  • 2022-03-28-13-35-50.bpo-27929.j5mAmV.rst
  • 2022-03-30-01-17-43.bpo-47151.z-nQkR.rst
  • 2022-03-30-18-35-50.bpo-47167.nCNHsB.rst
  • Tests
  • Windows
  • macOS
  • Modules
  • Objects
  • PCbuild
  • Parser
  • Python
  • README.rst
  • Tools
  • configure
  • configure.ac
  • pyconfig.h.in

    • Some content is hidden

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

    279 files changed

    +7320
    -3372
    lines changed

    ‎.gitattributes

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -60,14 +60,17 @@ PC/readme.txt text eol=crlf
    6060

    6161
    **/clinic/*.c.h generated
    6262
    *_db.h generated
    63+
    Doc/data/stable_abi.dat generated
    6364
    Doc/library/token-list.inc generated
    6465
    Include/internal/pycore_ast.h generated
    6566
    Include/internal/pycore_ast_state.h generated
    6667
    Include/opcode.h generated
    6768
    Include/token.h generated
    6869
    Lib/keyword.py generated
    70+
    Lib/test/test_stable_abi_ctypes.py generated
    6971
    Lib/token.py generated
    7072
    Objects/typeslots.inc generated
    73+
    PC/python3dll.c generated
    7174
    Parser/parser.c generated
    7275
    Parser/token.c generated
    7376
    Programs/test_frozenmain.h generated

    ‎Doc/c-api/bytearray.rst

    Lines changed: 0 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -42,8 +42,6 @@ Direct API functions
    4242
    Return a new bytearray object from any object, *o*, that implements the
    4343
    :ref:`buffer protocol <bufferobjects>`.
    4444
    45-
    .. XXX expand about the buffer protocol, at least somewhere
    46-
    4745
    4846
    .. c:function:: PyObject* PyByteArray_FromStringAndSize(const char *string, Py_ssize_t len)
    4947

    ‎Doc/c-api/bytes.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -5,7 +5,7 @@
    55
    Bytes Objects
    66
    -------------
    77

    8-
    These functions raise :exc:`TypeError` when expecting a bytes parameter and are
    8+
    These functions raise :exc:`TypeError` when expecting a bytes parameter and
    99
    called with a non-bytes parameter.
    1010

    1111
    .. index:: object: bytes

    ‎Doc/c-api/call.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -26,7 +26,7 @@ This convention is not only used by *tp_call*:
    2626
    :c:member:`~PyTypeObject.tp_new` and :c:member:`~PyTypeObject.tp_init`
    2727
    also pass arguments this way.
    2828

    29-
    To call an object, use :c:func:`PyObject_Call` or other
    29+
    To call an object, use :c:func:`PyObject_Call` or another
    3030
    :ref:`call API <capi-call>`.
    3131

    3232

    ‎Doc/c-api/exceptions.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -281,7 +281,7 @@ For convenience, some of these functions will always return a
    281281
    282282
    .. c:function:: void PyErr_SyntaxLocation(const char *filename, int lineno)
    283283
    284-
    Like :c:func:`PyErr_SyntaxLocationEx`, but the col_offset parameter is
    284+
    Like :c:func:`PyErr_SyntaxLocationEx`, but the *col_offset* parameter is
    285285
    omitted.
    286286
    287287
    @@ -333,7 +333,7 @@ an error value).
    333333
    334334
    Issue a warning message with explicit control over all warning attributes. This
    335335
    is a straightforward wrapper around the Python function
    336-
    :func:`warnings.warn_explicit`, see there for more information. The *module*
    336+
    :func:`warnings.warn_explicit`; see there for more information. The *module*
    337337
    and *registry* arguments may be set to ``NULL`` to get the default effect
    338338
    described there.
    339339
    @@ -441,7 +441,7 @@ Querying the error indicator
    441441
    error indicator.
    442442
    443443
    444-
    .. c:function:: void PyErr_NormalizeException(PyObject**exc, PyObject**val, PyObject**tb)
    444+
    .. c:function:: void PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
    445445
    446446
    Under certain circumstances, the values returned by :c:func:`PyErr_Fetch` below
    447447
    can be "unnormalized", meaning that ``*exc`` is a class object but ``*val`` is

    ‎Doc/c-api/init.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1792,7 +1792,7 @@ is not possible due to its implementation being opaque at build time.
    17921792
    argument is `NULL`.
    17931793
    17941794
    .. note::
    1795-
    A freed key becomes a dangling pointer, you should reset the key to
    1795+
    A freed key becomes a dangling pointer. You should reset the key to
    17961796
    `NULL`.
    17971797
    17981798

    ‎Doc/c-api/init_config.rst

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -16,12 +16,12 @@ There are two kinds of configuration:
    1616

    1717
    * The :ref:`Python Configuration <init-python-config>` can be used to build a
    1818
    customized Python which behaves as the regular Python. For example,
    19-
    environments variables and command line arguments are used to configure
    19+
    environment variables and command line arguments are used to configure
    2020
    Python.
    2121

    2222
    * The :ref:`Isolated Configuration <init-isolated-conf>` can be used to embed
    2323
    Python into an application. It isolates Python from the system. For example,
    24-
    environments variables are ignored, the LC_CTYPE locale is left unchanged and
    24+
    environment variables are ignored, the LC_CTYPE locale is left unchanged and
    2525
    no signal handler is registered.
    2626

    2727
    The :c:func:`Py_RunMain` function can be used to write a customized Python
    @@ -1316,7 +1316,7 @@ Isolated Configuration
    13161316
    isolate Python from the system. For example, to embed Python into an
    13171317
    application.
    13181318
    1319-
    This configuration ignores global configuration variables, environments
    1319+
    This configuration ignores global configuration variables, environment
    13201320
    variables, command line arguments (:c:member:`PyConfig.argv` is not parsed)
    13211321
    and user site directory. The C standard streams (ex: ``stdout``) and the
    13221322
    LC_CTYPE locale are left unchanged. Signal handlers are not installed.
    @@ -1460,7 +1460,7 @@ Multi-Phase Initialization Private Provisional API
    14601460
    ==================================================
    14611461
    14621462
    This section is a private provisional API introducing multi-phase
    1463-
    initialization, the core feature of the :pep:`432`:
    1463+
    initialization, the core feature of :pep:`432`:
    14641464
    14651465
    * "Core" initialization phase, "bare minimum Python":
    14661466

    ‎Doc/c-api/iter.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -14,8 +14,8 @@ There are two functions specifically for working with iterators.
    1414
    1515
    .. c:function:: int PyAIter_Check(PyObject *o)
    1616
    17-
    Returns non-zero if the object 'obj' provides :class:`AsyncIterator`
    18-
    protocols, and ``0`` otherwise. This function always succeeds.
    17+
    Return non-zero if the object *o* provides the :class:`AsyncIterator`
    18+
    protocol, and ``0`` otherwise. This function always succeeds.
    1919
    2020
    .. versionadded:: 3.10
    2121

    ‎Doc/c-api/long.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -41,7 +41,7 @@ distinguished from a number. Use :c:func:`PyErr_Occurred` to disambiguate.
    4141
    Return a new :c:type:`PyLongObject` object from *v*, or ``NULL`` on failure.
    4242
    4343
    The current implementation keeps an array of integer objects for all integers
    44-
    between ``-5`` and ``256``, when you create an int in that range you actually
    44+
    between ``-5`` and ``256``. When you create an int in that range you actually
    4545
    just get back a reference to the existing object.
    4646
    4747

    ‎Doc/c-api/mapping.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,10 +11,10 @@ See also :c:func:`PyObject_GetItem`, :c:func:`PyObject_SetItem` and
    1111

    1212
    .. c:function:: int PyMapping_Check(PyObject *o)
    1313
    14-
    Return ``1`` if the object provides mapping protocol or supports slicing,
    14+
    Return ``1`` if the object provides the mapping protocol or supports slicing,
    1515
    and ``0`` otherwise. Note that it returns ``1`` for Python classes with
    16-
    a :meth:`__getitem__` method since in general case it is impossible to
    17-
    determine what type of keys it supports. This function always succeeds.
    16+
    a :meth:`__getitem__` method, since in general it is impossible to
    17+
    determine what type of keys the class supports. This function always succeeds.
    1818
    1919
    2020
    .. c:function:: Py_ssize_t PyMapping_Size(PyObject *o)

    ‎Doc/c-api/memory.rst

    Lines changed: 1 addition & 1 deletion
    < 10000 td data-grid-cell-id="diff-bf49cfbf2170181a424cce2eba394150adb4adce4579e5d74f2b1343ce5026b2-309-308-2" data-line-anchor="diff-bf49cfbf2170181a424cce2eba394150adb4adce4579e5d74f2b1343ce5026b2L309" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-deletionLine-bgColor, var(--diffBlob-deletion-bgColor-line));padding-right:24px" tabindex="-1" valign="top" class="focusable-grid-cell diff-text-cell left-side-diff-cell border-right left-side">-
    successfully casted to a Python object when intercepting the allocating
    Original file line numberDiff line numberDiff line change
    @@ -306,7 +306,7 @@ memory from the Python heap.
    306306
    307307
    .. note::
    308308
    There is no guarantee that the memory returned by these allocators can be
    309
    309+
    successfully cast to a Python object when intercepting the allocating
    310310
    functions in this domain by the methods described in
    311311
    the :ref:`Customize Memory Allocators <customize-memory-allocators>` section.
    312312

    ‎Doc/c-api/method.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -27,7 +27,7 @@ to bind a :c:data:`PyCFunction` to a class object. It replaces the former call
    2727
    2828
    .. c:function:: PyObject* PyInstanceMethod_New(PyObject *func)
    2929
    30-
    Return a new instance method object, with *func* being any callable object
    30+
    Return a new instance method object, with *func* being any callable object.
    3131
    *func* is the function that will be called when the instance method is
    3232
    called.
    3333

    ‎Doc/c-api/number.rst

    Lines changed: 5 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -44,7 +44,7 @@ Number Protocol
    4444
    .. c:function:: PyObject* PyNumber_FloorDivide(PyObject *o1, PyObject *o2)
    4545
    4646
    Return the floor of *o1* divided by *o2*, or ``NULL`` on failure. This is
    47-
    equivalent to the "classic" division of integers.
    47+
    the equivalent of the Python expression ``o1 // o2``.
    4848
    4949
    5050
    .. c:function:: PyObject* PyNumber_TrueDivide(PyObject *o1, PyObject *o2)
    @@ -53,7 +53,7 @@ Number Protocol
    5353
    *o2*, or ``NULL`` on failure. The return value is "approximate" because binary
    5454
    floating point numbers are approximate; it is not possible to represent all real
    5555
    numbers in base two. This function can return a floating point value when
    56-
    passed two integers.
    56+
    passed two integers. This is the equivalent of the Python expression ``o1 / o2``.
    5757
    5858
    5959
    .. c:function:: PyObject* PyNumber_Remainder(PyObject *o1, PyObject *o2)
    @@ -180,6 +180,7 @@ Number Protocol
    180180
    floating point numbers are approximate; it is not possible to represent all real
    181181
    numbers in base two. This function can return a floating point value when
    182182
    passed two integers. The operation is done *in-place* when *o1* supports it.
    183+
    This is the equivalent of the Python statement ``o1 /= o2``.
    183184
    184185
    185186
    .. c:function:: PyObject* PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2)
    @@ -285,6 +286,6 @@ Number Protocol
    285286
    286287
    .. c:function:: int PyIndex_Check(PyObject *o)
    287288
    288-
    Returns ``1`` if *o* is an index integer (has the nb_index slot of the
    289-
    tp_as_number structure filled in), and ``0`` otherwise.
    289+
    Returns ``1`` if *o* is an index integer (has the ``nb_index`` slot of the
    290+
    ``tp_as_number`` structure filled in), and ``0`` otherwise.
    290291
    This function always succeeds.

    ‎Doc/c-api/object.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -93,7 +93,7 @@ Object Protocol
    9393
    return ``0`` on success. This is the equivalent of the Python statement
    9494
    ``o.attr_name = v``.
    9595
    96-
    If *v* is ``NULL``, the attribute is deleted, however this feature is
    96+
    If *v* is ``NULL``, the attribute is deleted, but this feature is
    9797
    deprecated in favour of using :c:func:`PyObject_DelAttrString`.
    9898
    9999
    @@ -291,7 +291,7 @@ Object Protocol
    291291
    of object *o*. On failure, raises :exc:`SystemError` and returns ``NULL``. This
    292292
    is equivalent to the Python expression ``type(o)``. This function increments the
    293293
    reference count of the return value. There's really no reason to use this
    294-
    function instead of the common expression ``o->ob_type``, which returns a
    294+
    function instead of the :c:func:`Py_TYPE()` function, which returns a
    295295
    pointer of type :c:type:`PyTypeObject*`, except when the incremented reference
    296296
    count is needed.
    297297

    ‎Doc/c-api/sequence.rst

    Lines changed: 5 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,10 +8,10 @@ Sequence Protocol
    88

    99
    .. c:function:: int PySequence_Check(PyObject *o)
    1010
    11-
    Return ``1`` if the object provides sequence protocol, and ``0`` otherwise.
    11+
    Return ``1`` if the object provides the sequence protocol, and ``0`` otherwise.
    1212
    Note that it returns ``1`` for Python classes with a :meth:`__getitem__`
    13-
    method unless they are :class:`dict` subclasses since in general case it
    14-
    is impossible to determine what the type of keys it supports. This
    13+
    method, unless they are :class:`dict` subclasses, since in general it
    14+
    is impossible to determine what type of keys the class supports. This
    1515
    function always succeeds.
    1616
    1717
    @@ -69,7 +69,7 @@ Sequence Protocol
    6969
    is the equivalent of the Python statement ``o[i] = v``. This function *does
    7070
    not* steal a reference to *v*.
    7171
    72-
    If *v* is ``NULL``, the element is deleted, however this feature is
    72+
    If *v* is ``NULL``, the element is deleted, but this feature is
    7373
    deprecated in favour of using :c:func:`PySequence_DelItem`.
    7474
    7575
    @@ -147,7 +147,7 @@ Sequence Protocol
    147147
    148148
    Returns the length of *o*, assuming that *o* was returned by
    149149
    :c:func:`PySequence_Fast` and that *o* is not ``NULL``. The size can also be
    150-
    gotten by calling :c:func:`PySequence_Size` on *o*, but
    150+
    retrieved by calling :c:func:`PySequence_Size` on *o*, but
    151151
    :c:func:`PySequence_Fast_GET_SIZE` is faster because it can assume *o* is a
    152152
    list or tuple.
    153153

    ‎Doc/c-api/set.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,7 @@ Set Objects
    1313
    object: frozenset
    1414

    1515
    This section details the public API for :class:`set` and :class:`frozenset`
    16-
    objects. Any functionality not listed below is best accessed using the either
    16+
    objects. Any functionality not listed below is best accessed using either
    1717
    the abstract object protocol (including :c:func:`PyObject_CallMethod`,
    1818
    :c:func:`PyObject_RichCompareBool`, :c:func:`PyObject_Hash`,
    1919
    :c:func:`PyObject_Repr`, :c:func:`PyObject_IsTrue`, :c:func:`PyObject_Print`, and
    @@ -31,7 +31,7 @@ the abstract object protocol (including :c:func:`PyObject_CallMethod`,
    3131
    in that it is a fixed size for small sets (much like tuple storage) and will
    3232
    point to a separate, variable sized block of memory for medium and large sized
    3333
    sets (much like list storage). None of the fields of this structure should be
    34-
    considered public and are subject to change. All access should be done through
    34+
    considered public and all are subject to change. All access should be done through
    3535
    the documented API rather than by manipulating the values in the structure.
    3636

    3737

    @@ -131,7 +131,7 @@ or :class:`frozenset` or instances of their subtypes.
    131131
    .. c:function:: int PySet_Add(PyObject *set, PyObject *key)
    132132
    133133
    Add *key* to a :class:`set` instance. Also works with :class:`frozenset`
    134-
    instances (like :c:func:`PyTuple_SetItem` it can be used to fill-in the values
    134+
    instances (like :c:func:`PyTuple_SetItem` it can be used to fill in the values
    135135
    of brand new frozensets before they are exposed to other code). Return ``0`` on
    136136
    success or ``-1`` on failure. Raise a :exc:`TypeError` if the *key* is
    137137
    unhashable. Raise a :exc:`MemoryError` if there is no room to grow. Raise a

    ‎Doc/c-api/structures.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -504,7 +504,7 @@ Accessing attributes of extension types
    504504
    +=============+==================+===================================+
    505505
    | name | const char \* | attribute name |
    506506
    +-------------+------------------+-----------------------------------+
    507-
    | get | getter | C Function to get the attribute |
    507+
    | get | getter | C function to get the attribute |
    508508
    +-------------+------------------+-----------------------------------+
    509509
    | set | setter | optional C function to set or |
    510510
    | | | delete the attribute, if omitted |

    ‎Doc/c-api/sys.rst

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -177,7 +177,7 @@ Operating System Utilities
    177177
    178178
    Return a pointer to a newly allocated byte string, use :c:func:`PyMem_Free`
    179179
    to free the memory. Return ``NULL`` on encoding error or memory allocation
    180-
    error
    180+
    error.
    181181
    182182
    If error_pos is not ``NULL``, ``*error_pos`` is set to ``(size_t)-1`` on
    183183
    success, or set to the index of the invalid character on encoding error.
    @@ -207,7 +207,7 @@ Operating System Utilities
    207207
    208208
    .. versionchanged:: 3.8
    209209
    The function now uses the UTF-8 encoding on Windows if
    210-
    :c:data:`Py_LegacyWindowsFSEncodingFlag` is zero;
    210+
    :c:data:`Py_LegacyWindowsFSEncodingFlag` is zero.
    211211
    212212
    213213
    .. _systemfunctions:
    @@ -356,7 +356,7 @@ accessible to C code. They all work with the current interpreter thread's
    356356
    .. c:function:: int PySys_AddAuditHook(Py_AuditHookFunction hook, void *userData)
    357357
    358358
    Append the callable *hook* to the list of active auditing hooks.
    359-
    Return zero for success
    359+
    Return zero on success
    360360
    and non-zero on failure. If the runtime has been initialized, also set an
    361361
    error on failure. Hooks added through this API are called for all
    362362
    interpreters created by the runtime.

    ‎Doc/c-api/type.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -296,12 +296,12 @@ The following functions and structs are used to create
    296296
    297297
    .. versionchanged:: 3.9
    298298
    299-
    Slots in :c:type:`PyBufferProcs` in may be set in the unlimited API.
    299+
    Slots in :c:type:`PyBufferProcs` may be set in the unlimited API.
    300300
    301301
    .. versionchanged:: 3.11
    302302
    :c:member:`~PyBufferProcs.bf_getbuffer` and
    303303
    :c:member:`~PyBufferProcs.bf_releasebuffer` are now available
    304-
    under limited API.
    304+
    under the limited API.
    305305
    306306
    .. c:member:: void *PyType_Slot.pfunc
    307307

    ‎Doc/extending/newtypes_tutorial.rst

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -67,8 +67,8 @@ The first bit is::
    6767
    This is what a Custom object will contain. ``PyObject_HEAD`` is mandatory
    6868
    at the start of each object struct and defines a field called ``ob_base``
    6969
    of type :c:type:`PyObject`, containing a pointer to a type object and a
    70-
    reference count (these can be accessed using the macros :c:macro:`Py_REFCNT`
    71-
    and :c:macro:`Py_TYPE` respectively). The reason for the macro is to
    70+
    reference count (these can be accessed using the macros :c:macro:`Py_TYPE`
    71+
    and :c:macro:`Py_REFCNT` respectively). The reason for the macro is to
    7272
    abstract away the layout and to enable additional fields in :ref:`debug builds
    7373
    <debug-build>`.
    7474

    ‎Doc/howto/regex.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -89,7 +89,7 @@ is the same as ``[a-c]``, which uses a range to express the same set of
    8989
    characters. If you wanted to match only lowercase letters, your RE would be
    9090
    ``[a-z]``.
    9191

    92-
    Metacharacters are not active inside classes. For example, ``[akm$]`` will
    92+
    Metacharacters (except ``\``) are not active inside classes. For example, ``[akm$]`` will
    9393
    match any of the characters ``'a'``, ``'k'``, ``'m'``, or ``'$'``; ``'$'`` is
    9494
    usually a metacharacter, but inside a character class it's stripped of its
    9595
    special nature.

    ‎Doc/library/codecs.rst

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -915,7 +915,7 @@ there's the so called BOM ("Byte Order Mark"). This is the Unicode character
    915915
    ``U+FEFF``. This character can be prepended to every ``UTF-16`` or ``UTF-32``
    916916
    byte sequence. The byte swapped version of this character (``0xFFFE``) is an
    917917
    illegal character that may not appear in a Unicode text. So when the
    918-
    first character in an ``UTF-16`` or ``UTF-32`` byte sequence
    918+
    first character in a ``UTF-16`` or ``UTF-32`` byte sequence
    919919
    appears to be a ``U+FFFE`` the bytes have to be swapped on decoding.
    920920
    Unfortunately the character ``U+FEFF`` had a second purpose as
    921921
    a ``ZERO WIDTH NO-BREAK SPACE``: a character that has no width and doesn't allow

    ‎Doc/library/crypt.rst

    Lines changed: 3 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -96,8 +96,7 @@ The :mod:`crypt` module defines the following functions:
    9696
    :func:`mksalt`, one of the ``crypt.METHOD_*`` values (though not all
    9797
    may be available on all platforms), or a full encrypted password
    9898
    including salt, as returned by this function. If *salt* is not
    99-
    provided, the strongest method will be used (as returned by
    100-
    :func:`methods`).
    99+
    provided, the strongest method available in :attr:`methods` will be used.
    101100

    102101
    Checking a password is usually done by passing the plain-text password
    103102
    as *word* and the full results of a previous :func:`crypt` call,
    @@ -125,8 +124,8 @@ The :mod:`crypt` module defines the following functions:
    125124
    .. function:: mksalt(method=None, *, rounds=None)
    126125

    127126
    Return a randomly generated salt of the specified method. If no
    128-
    *method* is given, the strongest method available as returned by
    129-
    :func:`methods` is used.
    127+
    *method* is given, the strongest method available in :attr:`methods` is
    128+
    used.
    130129

    131130
    The return value is a string suitable for passing as the *salt* argument
    132131
    to :func:`crypt`.

    0 commit comments

    Comments
     (0)
    0