Skip to content

Commit 0b5bcdd

Browse files
authored
Merge branch 'main' into csv-sniffer-counter-set
2 parents 080dbfc + eac37b4 commit 0b5bcdd

22 files changed

+1247
-235
lines changed

Doc/howto/remote_debugging.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,13 @@ To locate a thread:
374374
reliable thread to target.
375375

376376
3. Optionally, use the offset ``interpreter_state.threads_head`` to iterate
377-
through the linked list of all thread states. Each ``PyThreadState`` structure
378-
contains a ``native_thread_id`` field, which may be compared to a target thread
379-
ID to find a specific thread.
377+
through the linked list of all thread states. Each ``PyThreadState``
378+
structure contains a ``native_thread_id`` field, which may be compared to
379+
a target thread ID to find a specific thread.
380380

381-
1. Once a valid ``PyThreadState`` has been found, its address can be used in
382-
later steps of the protocol, such as writing debugger control fields and
383-
scheduling execution.
381+
4. Once a valid ``PyThreadState`` has been found, its address can be used in
382+
later steps of the protocol, such as writing debugger control fields and
383+
scheduling execution.
384384

385385
The following is an example implementation that locates the main thread state::
386386

@@ -454,15 +454,15 @@ its fields are defined by the ``_Py_DebugOffsets`` structure and include the
454454
following:
455455

456456
- ``debugger_script_path``: A fixed-size buffer that holds the full path to a
457-
Python source file (``.py``). This file must be accessible and readable by
458-
the target process when execution is triggered.
457+
Python source file (``.py``). This file must be accessible and readable by
458+
the target process when execution is triggered.
459459

460460
- ``debugger_pending_call``: An integer flag. Setting this to ``1`` tells the
461-
interpreter that a script is ready to be executed.
461+
interpreter that a script is ready to be executed.
462462

463463
- ``eval_breaker``: A field checked by the interpreter during execution.
464-
Setting bit 5 (``_PY_EVAL_PLEASE_STOP_BIT``, value ``1U << 5``) in this
465-
field causes the interpreter to pause and check for debugger activity.
464+
Setting bit 5 (``_PY_EVAL_PLEASE_STOP_BIT``, value ``1U << 5``) in this
465+
field causes the interpreter to pause and check for debugger activity.
466466

467467
To complete the injection, the debugger must perform the following steps:
468468

Doc/library/asyncio-protocol.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,11 @@ Subprocess Transports
390390
Return the transport for the communication pipe corresponding to the
391391
integer file descriptor *fd*:
392392

393-
* ``0``: readable streaming transport of the standard input (*stdin*),
393+
* ``0``: writable streaming transport of the standard input (*stdin*),
394394
or :const:`None` if the subprocess was not created with ``stdin=PIPE``
395-
* ``1``: writable streaming transport of the standard output (*stdout*),
395+
* ``1``: readable streaming transport of the standard output (*stdout*),
396396
or :const:`None` if the subprocess was not created with ``stdout=PIPE``
397-
* ``2``: writable streaming transport of the standard error (*stderr*),
397+
* ``2``: readable streaming transport of the standard error (*stderr*),
398398
or :const:`None` if the subprocess was not created with ``stderr=PIPE``
399399
* other *fd*: :const:`None`
400400

Doc/library/asyncio-sync.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Event
157157

158158
Clear (unset) the event.
159159

160-
Tasks awaiting on :meth:`~Event.wait` will now block until the
160+
Subsequent tasks awaiting on :meth:`~Event.wait` will now block until the
161161
:meth:`~Event.set` method is called again.
162162

163163
.. method:: is_set()

Doc/library/http.cookies.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ The character set, :data:`string.ascii_letters`, :data:`string.digits` and
2828
in a cookie name (as :attr:`~Morsel.key`).
2929

3030
.. versionchanged:: 3.3
31-
Allowed ':' as a valid cookie name character.
31+
Allowed '``:``' as a valid cookie name character.
3232

33+
.. versionchanged:: next
34+
Allowed '``"``' as a valid cookie value character.
3335

3436
.. note::
3537

@@ -314,3 +316,10 @@ The following example demonstrates how to use the :mod:`http.cookies` module.
314316
>>> print(C)
315317
Set-Cookie: number=7
316318
Set-Cookie: string=seven
319+
>>> import json
320+
>>> C = cookies.SimpleCookie()
321+
>>> C.load(f'cookies=7; mixins="{json.dumps({"chips": "dark chocolate"})}"; state=gooey')
322+
>>> print(C)
323+
Set-Cookie: cookies=7
324+
Set-Cookie: mixins="{"chips": "dark chocolate"}"
325+
Set-Cookie: state=gooey

Doc/library/profile.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ Analysis of the profiler data is done using the :class:`~pstats.Stats` class.
791791
significant entries. Initially, the list is taken to be the complete set
792792
of profiled functions. Each restriction is either an integer (to select a
793793
count of lines), or a decimal fraction between 0.0 and 1.0 inclusive (to
794-
select a percentage of lines), or a string that will interpreted as a
794+
select a percentage of lines), or a string that will be interpreted as a
795795
regular expression (to pattern match the standard name that is printed).
796796
If several restrictions are provided, then they are applied sequentially.
797797
For example::

Doc/whatsnew/3.15.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,13 @@ http.client
274274
(Contributed by Alexander Enrique Urieles Nieto in :gh:`131724`.)
275275

276276

277+
http.cookies
278+
------------
279+
280+
* Allow '``"``' double quotes in cookie values.
281+
(Contributed by Nick Burns and Senthil Kumaran in :gh:`92936`.)
282+
283+
277284
math
278285
----
279286

Include/internal/pycore_global_objects_fini_generated.h

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

Include/internal/pycore_global_strings.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ struct _Py_global_strings {
327327
STRUCT_FOR_ID(c_exception)
328328
STRUCT_FOR_ID(c_parameter_type)
329329
STRUCT_FOR_ID(c_return)
330+
STRUCT_FOR_ID(c_stack)
330331
STRUCT_FOR_ID(cached_datetime_module)
331332
STRUCT_FOR_ID(cached_statements)
332333
STRUCT_FOR_ID(cadata)
@@ -341,6 +342,7 @@ struct _Py_global_strings {
341342
STRUCT_FOR_ID(category)
342343
STRUCT_FOR_ID(cb_type)
343344
STRUCT_FOR_ID(certfile)
345+
STRUCT_FOR_ID(chain)
344346
STRUCT_FOR_ID(check_same_thread)
345347
STRUCT_FOR_ID(clear)
346348
STRUCT_FOR_ID(close)
@@ -435,6 +437,7 @@ struct _Py_global_strings {
435437
STRUCT_FOR_ID(excepthook)
436438
STRUCT_FOR_ID(exception)
437439
STRUCT_FOR_ID(existing_file_name)
440+
STRUCT_FOR_ID(exit)
438441
STRUCT_FOR_ID(exp)
439442
STRUCT_FOR_ID(expression)
440443
STRUCT_FOR_ID(extend)
@@ -695,6 +698,7 @@ struct _Py_global_strings {
695698
STRUCT_FOR_ID(rel_tol)
696699
STRUCT_FOR_ID(release)
697700
STRUCT_FOR_ID(reload)
701+
STRUCT_FOR_ID(repeat)
698702
STRUCT_FOR_ID(repl)
699703
STRUCT_FOR_ID(replace)
700704
STRUCT_FOR_ID(reqrefs)
@@ -733,6 +737,7 @@ struct _Py_global_strings {
733737
STRUCT_FOR_ID(shared)
734738
STRUCT_FOR_ID(show_cmd)
735739
STRUCT_FOR_ID(signed)
740+
STRUCT_FOR_ID(signum)
736741
STRUCT_FOR_ID(size)
737742
STRUCT_FOR_ID(sizehint)
738743
STRUCT_FOR_ID(skip_file_prefixes)

Include/internal/pycore_runtime_init_generated.h

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

Include/internal/pycore_unicodeobject_generated.h

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

0 commit comments

Comments
 (0)