Skip to content

Commit 4575ba3

Browse files
tirantiran
authored
Merge branch '3.11' into backport-8b24d60-3.11
2 parents 0788456 + c7ac8b6 commit 4575ba3

File tree

62 files changed

+710
-440
lines changed

Some content is hidden

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

62 files changed

+710
-440
lines changed

‎Doc/includes/sqlite3/executemany_1.py‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Doc/includes/sqlite3/executemany_2.py‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Doc/includes/sqlite3/executescript.py‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Doc/library/concurrent.futures.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,13 @@ And::
149149
An :class:`Executor` subclass that uses a pool of at most *max_workers*
150150
threads to execute calls asynchronously.
151151

152+
All threads enqueued to ``ThreadPoolExecutor`` will be joined before the
153+
interpreter can exit. Note that the exit handler which does this is
154+
executed *before* any exit handlers added using `atexit`. This means
155+
exceptions in the main thread must be caught and handled in order to
156+
signal threads to exit gracefully. For this reason, it is recommended
157+
that ``ThreadPoolExecutor`` not be used for long-running tasks.
158+
152159
*initializer* is an optional callable that is called at the start of
153160
each worker thread; *initargs* is a tuple of arguments passed to the
154161
initializer. Should *initializer* raise an exception, all currently

‎Doc/library/datetime.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,8 +589,8 @@ Supported operations:
589589
+-------------------------------+----------------------------------------------+
590590
| Operation | Result |
591591
+===============================+==============================================+
592-
| ``date2 = date1 + timedelta`` | *date2* is ``timedelta.days`` days removed |
593-
| | from *date1*. (1) |
592+
| ``date2 = date1 + timedelta`` | *date2* will be ``timedelta.days`` days |
593+
| | after *date1*. (1) |
594594
+-------------------------------+----------------------------------------------+
595595
| ``date2 = date1 - timedelta`` | Computes *date2* such that ``date2 + |
596596
| | timedelta == date1``. (2) |

0 commit comments

Comments
 (0)