Mailman 3 December 2021 - Python-checkins

bpo-46120: State that `|` is preferred over `Union` (GH-30222)
by gpshead Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/1b30660c3b40da557050948ac8635f2dc5… commit: 1b30660c3b40da557050948ac8635f2dc50c4ee2 branch: main author: Nikita Sobolev <mail(a)sobolevn.me> committer: gpshead <greg(a)krypto.org> date: 2021-12-24T13:36:09-08:00 summary: bpo-46120: State that `|` is preferred over `Union` (GH-30222) Co-authored-by: Éric <merwok(a)netwok.org> Co-authored-by: Guido van Rossum <gvanrossum(a)gmail.com> files: A Misc/NEWS.d/next/Documentation/2021-12-21-12-45-57.bpo-46120.PE0DmJ.rst M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 727941b57b547..08b59d84246f8 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -625,7 +625,7 @@ These can be used as types in annotations using ``[]``, each having a unique syn Union type; ``Union[X, Y]`` is equivalent to ``X | Y`` and means either X or Y. - To define a union, use e.g. ``Union[int, str]`` or the shorthand ``int | str``. Details: + To define a union, use e.g. ``Union[int, str]`` or the shorthand ``int | str``. Using that shorthand is recommended. Details: * The arguments must be types and there must be at least one. diff --git a/Misc/NEWS.d/next/Documentation/2021-12-21-12-45-57.bpo-46120.PE0DmJ.rst b/Misc/NEWS.d/next/Documentation/2021-12-21-12-45-57.bpo-46120.PE0DmJ.rst new file mode 100644 index 0000000000000..17f67472e2ab0 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2021-12-21-12-45-57.bpo-46120.PE0DmJ.rst @@ -0,0 +1 @@ +State that ``|`` is preferred for readability over ``Union`` in the :mod:`typing` docs.

1 0

bpo-45878: convert `try/except` to `self.assertRaises` in `Lib/ctypes/test/test_functions.py` (GH-29721) (GH-29748)
by serhiy-storchaka Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/a9e0b2b49374df91c40fe409508cfcdc63… commit: a9e0b2b49374df91c40fe409508cfcdc6332450e branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-24T11:28:57+02:00 summary: bpo-45878: convert `try/except` to `self.assertRaises` in `Lib/ctypes/test/test_functions.py` (GH-29721) (GH-29748) (cherry picked from commit b48ac6fe38b2fca9963b097c04cdecfc6083104e) Co-authored-by: Nikita Sobolev <mail(a)sobolevn.me> files: A Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst M Lib/ctypes/test/test_functions.py diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py index d3c6536f2766a..bdb044e594a2c 100644 --- a/Lib/ctypes/test/test_functions.py +++ b/Lib/ctypes/test/test_functions.py @@ -35,34 +35,24 @@ def test_mro(self): # wasn't checked, and it even crashed Python. # Found by Greg Chapman. - try: + with self.assertRaises(TypeError): class X(object, Array): _length_ = 5 _type_ = "i" - except TypeError: - pass - from _ctypes import _Pointer - try: + with self.assertRaises(TypeError): class X(object, _Pointer): pass - except TypeError: - pass from _ctypes import _SimpleCData - try: + with self.assertRaises(TypeError): class X(object, _SimpleCData): _type_ = "i" - except TypeError: - pass - try: + with self.assertRaises(TypeError): class X(object, Structure): _fields_ = [] - except TypeError: - pass - @need_symbol('c_wchar') def test_wchar_parm(self): diff --git a/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst b/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst new file mode 100644 index 0000000000000..fca90ef46981b --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst @@ -0,0 +1,2 @@ +Test ``Lib/ctypes/test/test_functions.py::test_mro`` now uses +``self.assertRaises`` instead of ``try/except``.

1 0

bpo-45878: convert `try/except` to `self.assertRaises` in `Lib/ctypes/test/test_functions.py` (GH-29721) (GH-29723)
by serhiy-storchaka Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/393ff040281db818f2d6e0240919316f58… commit: 393ff040281db818f2d6e0240919316f58f989a6 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-24T11:27:17+02:00 summary: bpo-45878: convert `try/except` to `self.assertRaises` in `Lib/ctypes/test/test_functions.py` (GH-29721) (GH-29723) (cherry picked from commit b48ac6fe38b2fca9963b097c04cdecfc6083104e) Co-authored-by: Nikita Sobolev <mail(a)sobolevn.me> files: A Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst M Lib/ctypes/test/test_functions.py diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py index d3c6536f2766a..bdb044e594a2c 100644 --- a/Lib/ctypes/test/test_functions.py +++ b/Lib/ctypes/test/test_functions.py @@ -35,34 +35,24 @@ def test_mro(self): # wasn't checked, and it even crashed Python. # Found by Greg Chapman. - try: + with self.assertRaises(TypeError): class X(object, Array): _length_ = 5 _type_ = "i" - except TypeError: - pass - from _ctypes import _Pointer - try: + with self.assertRaises(TypeError): class X(object, _Pointer): pass - except TypeError: - pass from _ctypes import _SimpleCData - try: + with self.assertRaises(TypeError): class X(object, _SimpleCData): _type_ = "i" - except TypeError: - pass - try: + with self.assertRaises(TypeError): class X(object, Structure): _fields_ = [] - except TypeError: - pass - @need_symbol('c_wchar') def test_wchar_parm(self): diff --git a/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst b/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst new file mode 100644 index 0000000000000..fca90ef46981b --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst @@ -0,0 +1,2 @@ +Test ``Lib/ctypes/test/test_functions.py::test_mro`` now uses +``self.assertRaises`` instead of ``try/except``.

1 0

bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240)
by miss-islington Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/d718764f389acd1bf4a5a65661bb58862f… commit: d718764f389acd1bf4a5a65661bb58862f14fb98 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-24T00:32:27-08:00 summary: bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240) Ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (cherry picked from commit b8de8b7039cee47465b2af9950b0b9ed2d3f2903) Co-authored-by: Nikita Sobolev <mail(a)sobolevn.me> files: A Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 548951a67a6f2..1406ed3b12c4a 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2443,13 +2443,21 @@ def test_expanduser(self): othername = username otherhome = userhome + fakename = 'fakeuser' + # This user can theoretically exist on a test runner. Create unique name: + try: + while pwd.getpwnam(fakename): + fakename += '1' + except KeyError: + pass # Non-existent name found + p1 = P('~/Documents') - p2 = P('~' + username + '/Documents') - p3 = P('~' + othername + '/Documents') - p4 = P('../~' + username + '/Documents') - p5 = P('/~' + username + '/Documents') + p2 = P(f'~{username}/Documents') + p3 = P(f'~{othername}/Documents') + p4 = P(f'../~{username}/Documents') + p5 = P(f'/~{username}/Documents') p6 = P('') - p7 = P('~fake800813user/Documents') + p7 = P(f'~{fakename}/Documents') with support.EnvironmentVarGuard() as env: env.pop('HOME', None) diff --git a/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst new file mode 100644 index 0000000000000..8ef9cd9b4a594 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst @@ -0,0 +1,2 @@ +Now ``fakename`` in ``test_pathlib.PosixPathTest.test_expanduser`` is checked +to be non-existent.

1 0

bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240)
by miss-islington Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/8005e22c9c71708ead0e5b16e55e005844… commit: 8005e22c9c71708ead0e5b16e55e005844c5131f branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-24T00:31:13-08:00 summary: bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240) Ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (cherry picked from commit b8de8b7039cee47465b2af9950b0b9ed2d3f2903) Co-authored-by: Nikita Sobolev <mail(a)sobolevn.me> files: A Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 2268d36b0639f..555c7ee795bd1 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2558,13 +2558,21 @@ def test_expanduser(self): othername = username otherhome = userhome + fakename = 'fakeuser' + # This user can theoretically exist on a test runner. Create unique name: + try: + while pwd.getpwnam(fakename): + fakename += '1' + except KeyError: + pass # Non-existent name found + p1 = P('~/Documents') - p2 = P('~' + username + '/Documents') - p3 = P('~' + othername + '/Documents') - p4 = P('../~' + username + '/Documents') - p5 = P('/~' + username + '/Documents') + p2 = P(f'~{username}/Documents') + p3 = P(f'~{othername}/Documents') + p4 = P(f'../~{username}/Documents') + p5 = P(f'/~{username}/Documents') p6 = P('') - p7 = P('~fake800813user/Documents') + p7 = P(f'~{fakename}/Documents') with os_helper.EnvironmentVarGuard() as env: env.pop('HOME', None) diff --git a/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst new file mode 100644 index 0000000000000..8ef9cd9b4a594 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst @@ -0,0 +1,2 @@ +Now ``fakename`` in ``test_pathlib.PosixPathTest.test_expanduser`` is checked +to be non-existent.

1 0

bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240)
by gpshead Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/b8de8b7039cee47465b2af9950b0b9ed2d… commit: b8de8b7039cee47465b2af9950b0b9ed2d3f2903 branch: main author: Nikita Sobolev <mail(a)sobolevn.me> committer: gpshead <greg(a)krypto.org> date: 2021-12-24T00:07:50-08:00 summary: bpo-46150: ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` (GH-30240) Ensure `fakeuser` does not exist in `PosixPathTest.test_expanduser` files: A Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 2268d36b0639f..555c7ee795bd1 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2558,13 +2558,21 @@ def test_expanduser(self): othername = username otherhome = userhome + fakename = 'fakeuser' + # This user can theoretically exist on a test runner. Create unique name: + try: + while pwd.getpwnam(fakename): + fakename += '1' + except KeyError: + pass # Non-existent name found + p1 = P('~/Documents') - p2 = P('~' + username + '/Documents') - p3 = P('~' + othername + '/Documents') - p4 = P('../~' + username + '/Documents') - p5 = P('/~' + username + '/Documents') + p2 = P(f'~{username}/Documents') + p3 = P(f'~{othername}/Documents') + p4 = P(f'../~{username}/Documents') + p5 = P(f'/~{username}/Documents') p6 = P('') - p7 = P('~fake800813user/Documents') + p7 = P(f'~{fakename}/Documents') with os_helper.EnvironmentVarGuard() as env: env.pop('HOME', None) diff --git a/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst new file mode 100644 index 0000000000000..8ef9cd9b4a594 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-23-13-42-15.bpo-46150.RhtADs.rst @@ -0,0 +1,2 @@ +Now ``fakename`` in ``test_pathlib.PosixPathTest.test_expanduser`` is checked +to be non-existent.

1 0

Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244)
by miss-islington Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/97a015b7b0e8b7ac8775ba5e33a9359a14… commit: 97a015b7b0e8b7ac8775ba5e33a9359a149253bc branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-24T00:07:41-08:00 summary: Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244) (cherry picked from commit d8880677a79ba4e70bbe7583eecf573bfceb7e98) Co-authored-by: Gregory P. Smith <greg(a)krypto.org> files: M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 183c157afdcd0..548951a67a6f2 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2449,7 +2449,7 @@ def test_expanduser(self): p4 = P('../~' + username + '/Documents') p5 = P('/~' + username + '/Documents') p6 = P('') - p7 = P('~fakeuser/Documents') + p7 = P('~fake800813user/Documents') with support.EnvironmentVarGuard() as env: env.pop('HOME', None)

1 0

Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244)
by miss-islington Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/1c77aa9fc3c105053167d519607565068a… commit: 1c77aa9fc3c105053167d519607565068a2688b5 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-24T00:07:24-08:00 summary: Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244) (cherry picked from commit d8880677a79ba4e70bbe7583eecf573bfceb7e98) Co-authored-by: Gregory P. Smith <greg(a)krypto.org> files: M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 5f6d9f47d13d7..2268d36b0639f 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2564,7 +2564,7 @@ def test_expanduser(self): p4 = P('../~' + username + '/Documents') p5 = P('/~' + username + '/Documents') p6 = P('') - p7 = P('~fakeuser/Documents') + p7 = P('~fake800813user/Documents') with os_helper.EnvironmentVarGuard() as env: env.pop('HOME', None)

1 0

Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244)
by gpshead Dec. 24, 2021

Dec. 24, 2021

https://github.com/python/cpython/commit/d8880677a79ba4e70bbe7583eecf573bfc… commit: d8880677a79ba4e70bbe7583eecf573bfceb7e98 branch: main author: Gregory P. Smith <greg(a)krypto.org> committer: gpshead <greg(a)krypto.org> date: 2021-12-23T19:17:40-08:00 summary: Allow test_pathlib to pass on systems where fakeuser exists. (GH-30244) files: M Lib/test/test_pathlib.py diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index 5f6d9f47d13d7..2268d36b0639f 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -2564,7 +2564,7 @@ def test_expanduser(self): p4 = P('../~' + username + '/Documents') p5 = P('/~' + username + '/Documents') p6 = P('') - p7 = P('~fakeuser/Documents') + p7 = P('~fake800813user/Documents') with os_helper.EnvironmentVarGuard() as env: env.pop('HOME', None)

1 0

typos (#30239)
by asvetlov Dec. 23, 2021

Dec. 23, 2021

https://github.com/python/cpython/commit/cf15419a99962b3503ff7123e148d71f7f… commit: cf15419a99962b3503ff7123e148d71f7f01bc15 branch: main author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2021-12-23T12:25:12+02:00 summary: typos (#30239) files: M Doc/library/asyncio-eventloop.rst diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index c25b3e80982ac..5b48945599f76 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -322,7 +322,7 @@ Creating Futures and Tasks .. method:: loop.create_future() - Create a :class:`asyncio.Future` object attached to the event loop. + Create an :class:`asyncio.Future` object attached to the event loop. This is the preferred way to create Futures in asyncio. This lets third-party event loops provide alternative implementations of @@ -649,7 +649,7 @@ Creating network servers * *backlog* is the maximum number of queued connections passed to :meth:`~socket.socket.listen` (defaults to 100). - * *ssl* can be set to a :class:`~ssl.SSLContext` instance to enable + * *ssl* can be set to an :class:`~ssl.SSLContext` instance to enable TLS over the accepted connections. * *reuse_address* tells the kernel to reuse a local socket in @@ -737,7 +737,7 @@ Creating network servers * *sock* is a preexisting socket object returned from :meth:`socket.accept <socket.socket.accept>`. - * *ssl* can be set to a :class:`~ssl.SSLContext` to enable SSL over + * *ssl* can be set to an :class:`~ssl.SSLContext` to enable SSL over the accepted connections. * *ssl_handshake_timeout* is (for an SSL connection) the time in seconds to

1 0