Skip to content

Commit cfda101

Browse files
Merge branch '3.13' into backport-f252132-3.13
2 parents a165639 + 7a90bb4 commit cfda101

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Doc/library/ast.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1301,7 +1301,7 @@ Control flow
13011301

13021302
``try`` blocks which are followed by ``except*`` clauses. The attributes are the
13031303
same as for :class:`Try` but the :class:`ExceptHandler` nodes in ``handlers``
1304-
are interpreted as ``except*`` blocks rather then ``except``.
1304+
are interpreted as ``except*`` blocks rather than ``except``.
13051305

13061306
.. doctest::
13071307

Doc/library/sys.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1835,7 +1835,7 @@ always available. Unless explicitly noted otherwise, all variables are read-only
18351835
returned by the :func:`open` function. Their parameters are chosen as
18361836
follows:
18371837

1838-
* The encoding and error handling are is initialized from
1838+
* The encoding and error handling are initialized from
18391839
:c:member:`PyConfig.stdio_encoding` and :c:member:`PyConfig.stdio_errors`.
18401840

18411841
On Windows, UTF-8 is used for the console device. Non-character

Lib/test/test_asyncio/test_subprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ def test_kill_issue43884(self):
219219
# kills the process and all its children.
220220
creationflags = CREATE_NEW_PROCESS_GROUP
221221
proc = self.loop.run_until_complete(
222-
asyncio.create_subprocess_shell(blocking_shell_command, stdout=asyncio.subprocess.PIPE,
222+
asyncio.create_subprocess_shell(blocking_shell_command,
223223
creationflags=creationflags)
224224
)
225225
self.loop.run_until_complete(asyncio.sleep(1))

0 commit comments

Comments
 (0)