8000 Merge branch main into main-slp · stackless-dev/stackless@190fa92 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit 190fa92

Browse files
author
Anselm Kruis
committed
Merge branch main into main-slp
2 parents a48f7d0 + 9535aff commit 190fa92

21 files changed

+180
-322
lines changed

‎.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
variables:
6060
testRunTitle: '$(build.sourceBranchName)-linux'
6161
testRunPlatform: linux
62-
openssl_version: 1.1.1b
62+
openssl_version: 1.1.1c
6363

6464
steps:
6565
- template: ./posix-steps.yml
@@ -116,7 +116,7 @@ jobs:
116116
variables:
117117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118118
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.1b
119+
openssl_version: 1.1.1c
120120

121121
steps:
122122
- template: ./posix-steps.yml

‎.azure-pipelines/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
variables:
6060
testRunTitle: '$(system.pullRequest.TargetBranch)-linux'
6161
testRunPlatform: linux
62-
openssl_version: 1.1.0j
62+
openssl_version: 1.1.1c
6363

6464
steps:
6565
- template: ./posix-steps.yml
@@ -116,7 +116,7 @@ jobs:
116116
variables:
117117
testRunTitle: '$(Build.SourceBranchName)-linux-coverage'
118118
testRunPlatform: linux-coverage
119-
openssl_version: 1.1.0j
119+
openssl_version: 1.1.1c
120120

121121
steps:
122122
- template: ./posix-steps.yml

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cache:
1111

1212
env:
1313
global:
14-
- OPENSSL=1.1.0i
14+
- OPENSSL=1.1.1c
1515
- OPENSSL_DIR="$HOME/multissl/openssl/${OPENSSL}"
1616
- PATH="${OPENSSL_DIR}/bin:$PATH"
1717
# Use -O3 because we don't use debugger on Travis-CI

‎Doc/library/asyncio-eventloop.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,18 @@ Running and stopping the loop
140140
The loop must not be running when this function is called.
141141
Any pending callbacks will be discarded.
142142

143-
This method clears all queues and shuts down the executor, but does
144-
not wait for the executor to finish.
143+
This method clears all queues and shuts down the default executor. By
144+
default, it waits for the default executor to finish. Set
145+
*loop.wait_executor_on_close* to ``False`` to not wait for the executor.
145146

146147
This method is idempotent and irreversible. No other methods
147148
should be called after the event loop is closed.
148149

150+
.. versionchanged:: 3.8
151+
The method now waits for the default executor to finish by default.
152+
Added *loop.wait_executor_on_close* attribute.
153+
154+
149155
.. coroutinemethod:: loop.shutdown_asyncgens()
150156

151157
Schedule all currently open :term:`asynchronous generator` objects to

‎Doc/library/ssl.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,19 @@ to speed up repeated connections from the same clients.
19591959

19601960
.. versionadded:: 3.7
19611961

1962+
.. attribute:: SSLContext.num_tickets
1963+
1964+
Control the number of TLS 1.3 session tickets of a
1965+
:attr:`TLS_PROTOCOL_SERVER` context. The setting has no impact on TLS
1966+
1.0 to 1.2 connections.
1967+
1968+
.. note::
1969+
1970+
This attribute is not available unless the ssl module is compiled
1971+
with OpenSSL 1.1.1 or newer.
1972+
1973+
.. versionadded:: 3.8
1974+
19621975
.. attribute:: SSLContext.options
19631976

19641977
An integer representing the set of SSL options enabled on this context.

‎Doc/whatsnew/3.7.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ including failing the host name check now raises
13071307
:exc:`~ssl.SSLCertVerificationError` and aborts the handshake with a proper
13081308
TLS Alert message. The new exception contains additional information.
13091309
Host name validation can be customized with
1310-
:attr:`SSLContext.host_flags <ssl.SSLContext.host_flags>`.
1310+
:attr:`SSLContext.hostname_checks_common_name <ssl.SSLContext.hostname_checks_common_name>`.
13111311
(Contributed by Christian Heimes in :issue:`31399`.)
13121312

13131313
.. note::
@@ -1320,8 +1320,7 @@ The ``ssl`` module no longer sends IP addresses in SNI TLS extension.
13201320
(Contributed by Christian Heimes in :issue:`32185`.)
13211321

13221322
:func:`~ssl.match_hostname` no longer supports partial wildcards like
1323-
``www*.example.org``. :attr:`SSLContext.host_flags <ssl.SSLContext.host_flags>`
1324-
has partial wildcard matching disabled by default.
1323+
``www*.example.org``.
13251324
(Contributed by Mandeep Singh in :issue:`23033` and Christian Heimes in
13261325
:issue:`31399`.)
13271326

‎Lib/asyncio/base_events.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,8 @@ async def wait_closed(self):
380380
class BaseEventLoop(events.AbstractEventLoop):
381381

382382
def __init__(self):
383+
# If true, close() waits for the default executor to finish
384+
self.wait_executor_on_close = True
383385
self._timer_cancelled_count = 0
384386
self._closed = False
385387
self._stopping = False
@@ -635,7 +637,7 @@ def close(self):
635637
executor = self._default_executor
636638
if executor is not None:
637639
self._default_executor = None
638-
executor.shutdown(wait=False)
640+
executor.shutdown(wait=self.wait_executor_on_close)
639641

640642
def is_closed(self):
641643
"""Returns True if the event loop was closed."""

0 commit comments

Comments
 (0)
0