Skip to content

Commit 0801a2b

Browse files
authored
Merge branch 'main' into cprofile-module-multiprocessing-update
2 parents c57719e + 15d7406 commit 0801a2b

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

Doc/c-api/bytes.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,14 +384,18 @@ Getters
384384
385385
Get the writer size.
386386
387+
The function does not invalidate pointers returned by
388+
:c:func:`PyBytesWriter_GetData`.
389+
387390
The function cannot fail.
388391
389392
.. c:function:: void* PyBytesWriter_GetData(PyBytesWriter *writer)
390393
391394
Get the writer data: start of the internal buffer.
392395
393-
The pointer is valid until :c:func:`PyBytesWriter_Finish` or
394-
:c:func:`PyBytesWriter_Discard` is called on *writer*.
396+
The pointer remains valid until a :c:type:`PyBytesWriter` function other
397+
than :c:func:`PyBytesWriter_GetData` or :c:func:`PyBytesWriter_GetSize` is
398+
called on *writer*.
395399
396400
The function cannot fail.
397401

Doc/library/logging.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ Formatter Objects
690690
:param defaults: A dictionary with default values to use in custom fields.
691691
For example,
692692
``logging.Formatter('%(ip)s %(message)s', defaults={"ip": None})``
693-
:type defaults: dict[str, Any]
693+
:type defaults: dict[str, typing.Any]
694694

695695
.. versionchanged:: 3.2
696696
Added the *style* parameter.

0 commit comments

Comments
 (0)