Mailman 3 December 2022 - Python-checkins

GH-100192: fix `asyncio` subprocess tests to pass env vars to subprocess (#100569)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/6835184a44389747dd151023b31a20ff75… commit: 6835184a44389747dd151023b31a20ff75d6a402 branch: main author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T11:16:04+05:30 summary: GH-100192: fix `asyncio` subprocess tests to pass env vars to subprocess (#100569) files: M Lib/test/test_asyncio/test_subprocess.py diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 1ae290a003f2..f1ad10a9903f 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -698,7 +698,8 @@ async def check_stdout_output(self, coro, output): def test_create_subprocess_env_shell(self) -> None: async def main() -> None: cmd = f'''{sys.executable} -c "import os, sys; sys.stdout.write(os.getenv('FOO'))"''' - env = {"FOO": 'bar'} + env = os.environ.copy() + env["FOO"] = "bar" proc = await asyncio.create_subprocess_shell( cmd, env=env, stdout=subprocess.PIPE ) @@ -710,7 +711,8 @@ def test_create_subprocess_env_exec(self) -> None: async def main() -> None: cmd = [sys.executable, "-c", "import os, sys; sys.stdout.write(os.getenv('FOO'))"] - env = {"FOO": 'baz'} + env = os.environ.copy() + env["FOO"] = "baz" proc = await asyncio.create_subprocess_exec( *cmd, env=env, stdout=subprocess.PIPE )

1 0

gh-55688: Add note about ending backslashes for raw strings (GH-94768)
by miss-islington Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/de621281ce704546b87334fd7da7a7ec53… commit: de621281ce704546b87334fd7da7a7ec534719b7 branch: 3.11 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-12-27T21:45:45-08:00 summary: gh-55688: Add note about ending backslashes for raw strings (GH-94768) (cherry picked from commit b95b1b3b25b0a93a22c7d58ac5bd5870e62070a8) Co-authored-by: Stanley <46876382+slateny(a)users.noreply.github.com> Co-authored-by: hauntsaninja <hauntsaninja(a)gmail.com> files: M Doc/faq/programming.rst M Doc/tutorial/introduction.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index c396e2b081fc..ba42289f3466 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1026,6 +1026,46 @@ What does 'UnicodeDecodeError' or 'UnicodeEncodeError' error mean? See the :ref:`unicode-howto`. +.. _faq-programming-raw-string-backslash: + +Can I end a raw string with an odd number of backslashes? +--------------------------------------------------------- + +A raw string ending with an odd number of backslashes will escape the string's quote:: + + >>> r'C:\this\will\not\work\' + File "<stdin>", line 1 + r'C:\this\will\not\work\' + ^ + SyntaxError: unterminated string literal (detected at line 1) + +There are several workarounds for this. One is to use regular strings and double +the backslashes:: + + >>> 'C:\\this\\will\\work\\' + 'C:\\this\\will\\work\\' + +Another is to concatenate a regular string containing an escaped backslash to the +raw string:: + + >>> r'C:\this\will\work' '\\' + 'C:\\this\\will\\work\\' + +It is also possible to use :func:`os.path.join` to append a backslash on Windows:: + + >>> os.path.join(r'C:\this\will\work', '') + 'C:\\this\\will\\work\\' + +Note that while a backslash will "escape" a quote for the purposes of +determining where the raw string ends, no escaping occurs when interpreting the +value of the raw string. That is, the backslash remains present in the value of +the raw string:: + + >>> r'backslash\'preserved' + "backslash\\'preserved" + +Also see the specification in the :ref:`language reference <strings>`. + Performance =========== diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index 558b1c3eec60..b7a89905e4f3 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -189,6 +189,11 @@ the first quote:: >>> print(r'C:\some\name') # note the r before the quote C:\some\name +There is one subtle aspect to raw strings: a raw string may not end in +an odd number of ``\`` characters; see +:ref:`the FAQ entry <faq-programming-raw-string-backslash>` for more information +and workarounds. + String literals can span multiple lines. One way is using triple-quotes: ``"""..."""`` or ``'''...'''``. End of lines are automatically included in the string, but it's possible to prevent this by adding a ``\`` at

1 0

gh-55688: Add note about ending backslashes for raw strings (GH-94768)
by miss-islington Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/97a3e18c8873228a7ab7f720954798c2c5… commit: 97a3e18c8873228a7ab7f720954798c2c5c7486d 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: 2022-12-27T21:39:53-08:00 summary: gh-55688: Add note about ending backslashes for raw strings (GH-94768) (cherry picked from commit b95b1b3b25b0a93a22c7d58ac5bd5870e62070a8) Co-authored-by: Stanley <46876382+slateny(a)users.noreply.github.com> Co-authored-by: hauntsaninja <hauntsaninja(a)gmail.com> files: M Doc/faq/programming.rst M Doc/tutorial/introduction.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index bd75801cc242..1bcca4c62d27 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1026,6 +1026,46 @@ What does 'UnicodeDecodeError' or 'UnicodeEncodeError' error mean? See the :ref:`unicode-howto`. +.. _faq-programming-raw-string-backslash: + +Can I end a raw string with an odd number of backslashes? +--------------------------------------------------------- + +A raw string ending with an odd number of backslashes will escape the string's quote:: + + >>> r'C:\this\will\not\work\' + File "<stdin>", line 1 + r'C:\this\will\not\work\' + ^ + SyntaxError: unterminated string literal (detected at line 1) + +There are several workarounds for this. One is to use regular strings and double +the backslashes:: + + >>> 'C:\\this\\will\\work\\' + 'C:\\this\\will\\work\\' + +Another is to concatenate a regular string containing an escaped backslash to the +raw string:: + + >>> r'C:\this\will\work' '\\' + 'C:\\this\\will\\work\\' + +It is also possible to use :func:`os.path.join` to append a backslash on Windows:: + + >>> os.path.join(r'C:\this\will\work', '') + 'C:\\this\\will\\work\\' + +Note that while a backslash will "escape" a quote for the purposes of +determining where the raw string ends, no escaping occurs when interpreting the +value of the raw string. That is, the backslash remains present in the value of +the raw string:: + + >>> r'backslash\'preserved' + "backslash\\'preserved" + +Also see the specification in the :ref:`language reference <strings>`. + Performance =========== diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index 558b1c3eec60..b7a89905e4f3 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -189,6 +189,11 @@ the first quote:: >>> print(r'C:\some\name') # note the r before the quote C:\some\name +There is one subtle aspect to raw strings: a raw string may not end in +an odd number of ``\`` characters; see +:ref:`the FAQ entry <faq-programming-raw-string-backslash>` for more information +and workarounds. + String literals can span multiple lines. One way is using triple-quotes: ``"""..."""`` or ``'''...'''``. End of lines are automatically included in the string, but it's possible to prevent this by adding a ``\`` at

1 0

gh-55688: Add note about ending backslashes for raw strings (#94768)
by hauntsaninja Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/b95b1b3b25b0a93a22c7d58ac5bd5870e6… commit: b95b1b3b25b0a93a22c7d58ac5bd5870e62070a8 branch: main author: Stanley <46876382+slateny(a)users.noreply.github.com> committer: hauntsaninja <12621235+hauntsaninja(a)users.noreply.github.com> date: 2022-12-28T00:30:42-05:00 summary: gh-55688: Add note about ending backslashes for raw strings (#94768) Co-authored-by: hauntsaninja <hauntsaninja(a)gmail.com> files: M Doc/faq/programming.rst M Doc/tutorial/introduction.rst diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index c396e2b081fc..ba42289f3466 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -1026,6 +1026,46 @@ What does 'UnicodeDecodeError' or 'UnicodeEncodeError' error mean? See the :ref:`unicode-howto`. +.. _faq-programming-raw-string-backslash: + +Can I end a raw string with an odd number of backslashes? +--------------------------------------------------------- + +A raw string ending with an odd number of backslashes will escape the string's quote:: + + >>> r'C:\this\will\not\work\' + File "<stdin>", line 1 + r'C:\this\will\not\work\' + ^ + SyntaxError: unterminated string literal (detected at line 1) + +There are several workarounds for this. One is to use regular strings and double +the backslashes:: + + >>> 'C:\\this\\will\\work\\' + 'C:\\this\\will\\work\\' + +Another is to concatenate a regular string containing an escaped backslash to the +raw string:: + + >>> r'C:\this\will\work' '\\' + 'C:\\this\\will\\work\\' + +It is also possible to use :func:`os.path.join` to append a backslash on Windows:: + + >>> os.path.join(r'C:\this\will\work', '') + 'C:\\this\\will\\work\\' + +Note that while a backslash will "escape" a quote for the purposes of +determining where the raw string ends, no escaping occurs when interpreting the +value of the raw string. That is, the backslash remains present in the value of +the raw string:: + + >>> r'backslash\'preserved' + "backslash\\'preserved" + +Also see the specification in the :ref:`language reference <strings>`. + Performance =========== diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst index 6532a4e2cc83..ebc2e9187534 100644 --- a/Doc/tutorial/introduction.rst +++ b/Doc/tutorial/introduction.rst @@ -189,6 +189,11 @@ the first quote:: >>> print(r'C:\some\name') # note the r before the quote C:\some\name +There is one subtle aspect to raw strings: a raw string may not end in +an odd number of ``\`` characters; see +:ref:`the FAQ entry <faq-programming-raw-string-backslash>` for more information +and workarounds. + String literals can span multiple lines. One way is using triple-quotes: ``"""..."""`` or ``'''...'''``. End of lines are automatically included in the string, but it's possible to prevent this by adding a ``\`` at

1 0

[3.11] GH-100342: check for allocation failure in AC `*args` parsing (GH-100343). (#100568)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/ebe428824d9c749577256cbcfb35945d8b… commit: ebe428824d9c749577256cbcfb35945d8b19c479 branch: 3.11 author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T10:11:27+05:30 summary: [3.11] GH-100342: check for allocation failure in AC `*args` parsing (GH-100343). (#100568) (cherry picked from commit 7cf164ad5e3c8c6af5ae8813ad6a784448605418) Co-authored-by: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst M Lib/test/clinic.test M Modules/clinic/_testclinic.c.h M Tools/clinic/clinic.py diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test index 217aa4c7e97a..0abadbe7f347 100644 --- a/Lib/test/clinic.test +++ b/Lib/test/clinic.test @@ -3327,6 +3327,9 @@ test_vararg_and_posonly(PyObject *module, PyObject *const *args, Py_ssize_t narg } a = args[0]; __clinic_args = PyTuple_New(nargs - 1); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 1; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[1 + i])); } @@ -3339,7 +3342,7 @@ exit: static PyObject * test_vararg_and_posonly_impl(PyObject *module, PyObject *a, PyObject *args) -/*[clinic end generated code: output=081a953b8cbe7617 input=08dc2bf7afbf1613]*/ +/*[clinic end generated code: output=79b75dc07decc8d6 input=08dc2bf7afbf1613]*/ /*[clinic input] test_vararg diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst b/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst new file mode 100644 index 000000000000..28f736337526 --- /dev/null +++ b/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst @@ -0,0 +1 @@ +Add missing ``NULL`` check for possible allocation failure in ``*args`` parsing in Argument Clinic. diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index 41555d801059..c97ac1c66296 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -2012,6 +2012,9 @@ vararg_and_posonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs) } a = args[0]; __clinic_args = PyTuple_New(nargs - 1); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 1; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[1 + i])); } @@ -2257,6 +2260,9 @@ gh_99233_refcount(PyObject *module, PyObject *const *args, Py_ssize_t nargs) goto exit; } __clinic_args = PyTuple_New(nargs - 0); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 0; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[0 + i])); } @@ -2299,4 +2305,4 @@ gh_99240_double_free(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=fe398ac790310bc4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=6b719efc1b8bd2c8 input=a9049054013a1b77]*/ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index a6d8b86a83ce..82e4919242c7 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -903,12 +903,16 @@ def parser_body(prototype, *fields, declarations=''): if not new_or_init: parser_code.append(normalize_snippet(""" %s = PyTuple_New(%s); + if (!%s) {{ + goto exit; + }} for (Py_ssize_t i = 0; i < %s; ++i) {{ PyTuple_SET_ITEM(%s, i, Py_NewRef(args[%d + i])); }} """ % ( p.converter.parser_name, left_args, + p.converter.parser_name, left_args, p.converter.parser_name, max_pos

1 0

add tests for `asyncio` transport sockets (#100263)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/5369bba8c594de7a643408550e19e1ff6d… commit: 5369bba8c594de7a643408550e19e1ff6df5178a branch: main author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T10:07:55+05:30 summary: add tests for `asyncio` transport sockets (#100263) files: M Lib/test/test_asyncio/test_events.py diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 153b2de81722..e7771edd2e4a 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -823,6 +823,29 @@ def test_create_server(self): # close server server.close() + def test_create_server_trsock(self): + proto = MyProto(self.loop) + f = self.loop.create_server(lambda: proto, '0.0.0.0', 0) + server = self.loop.run_until_complete(f) + self.assertEqual(len(server.sockets), 1) + sock = server.sockets[0] + self.assertIsInstance(sock, asyncio.trsock.TransportSocket) + host, port = sock.getsockname() + self.assertEqual(host, '0.0.0.0') + dup = sock.dup() + self.addCleanup(dup.close) + self.assertIsInstance(dup, socket.socket) + self.assertFalse(sock.get_inheritable()) + with self.assertRaises(ValueError): + sock.settimeout(1) + sock.settimeout(0) + self.assertEqual(sock.gettimeout(), 0) + with self.assertRaises(ValueError): + sock.setblocking(True) + sock.setblocking(False) + server.close() + + @unittest.skipUnless(hasattr(socket, 'SO_REUSEPORT'), 'No SO_REUSEPORT') def test_create_server_reuse_port(self): proto = MyProto(self.loop)

1 0

Fix copy-paste error in `Tools/clinic.py` (#100560)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/3da71ff0f26516c433538b2bfc4db196e2… commit: 3da71ff0f26516c433538b2bfc4db196e20e0d44 branch: main author: Nikita Sobolev <mail(a)sobolevn.me> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T09:57:57+05:30 summary: Fix copy-paste error in `Tools/clinic.py` (#100560) files: M Tools/clinic/clinic.py diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 552ed2c889a7..abff4d2583e1 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -2832,7 +2832,7 @@ def modify(self): """ The C statements required to modify this variable after parsing. Returns a string containing this code indented at column 0. - If no initialization is necessary, returns an empty string. + If no modification is necessary, returns an empty string. """ return ""

1 0

GH-100342: check for allocation failure in AC `*args` parsing (#100343)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/7cf164ad5e3c8c6af5ae8813ad6a784448… commit: 7cf164ad5e3c8c6af5ae8813ad6a784448605418 branch: main author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T09:46:28+05:30 summary: GH-100342: check for allocation failure in AC `*args` parsing (#100343) files: A Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst M Lib/test/clinic.test M Modules/clinic/_testclinic.c.h M Tools/clinic/clinic.py diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test index 0d844234d9d1..53e5df5ba872 100644 --- a/Lib/test/clinic.test +++ b/Lib/test/clinic.test @@ -3781,6 +3781,9 @@ test_vararg_and_posonly(PyObject *module, PyObject *const *args, Py_ssize_t narg } a = args[0]; __clinic_args = PyTuple_New(nargs - 1); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 1; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[1 + i])); } @@ -3793,7 +3796,7 @@ exit: static PyObject * test_vararg_and_posonly_impl(PyObject *module, PyObject *a, PyObject *args) -/*[clinic end generated code: output=081a953b8cbe7617 input=08dc2bf7afbf1613]*/ +/*[clinic end generated code: output=79b75dc07decc8d6 input=08dc2bf7afbf1613]*/ /*[clinic input] test_vararg diff --git a/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst b/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst new file mode 100644 index 000000000000..28f736337526 --- /dev/null +++ b/Misc/NEWS.d/next/Tools-Demos/2022-12-19-10-08-53.gh-issue-100342.qDFlQG.rst @@ -0,0 +1 @@ +Add missing ``NULL`` check for possible allocation failure in ``*args`` parsing in Argument Clinic. diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h index 21bde5294702..831f58ca650a 100644 --- a/Modules/clinic/_testclinic.c.h +++ b/Modules/clinic/_testclinic.c.h @@ -2409,6 +2409,9 @@ vararg_and_posonly(PyObject *module, PyObject *const *args, Py_ssize_t nargs) } a = args[0]; __clinic_args = PyTuple_New(nargs - 1); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 1; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[1 + i])); } @@ -2769,6 +2772,9 @@ gh_99233_refcount(PyObject *module, PyObject *const *args, Py_ssize_t nargs) goto exit; } __clinic_args = PyTuple_New(nargs - 0); + if (!__clinic_args) { + goto exit; + } for (Py_ssize_t i = 0; i < nargs - 0; ++i) { PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[0 + i])); } @@ -2811,4 +2817,4 @@ gh_99240_double_free(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=9a5ca5909c087102 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=e8211606b03d733a input=a9049054013a1b77]*/ diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py index 2fb1902a5b54..552ed2c889a7 100755 --- a/Tools/clinic/clinic.py +++ b/Tools/clinic/clinic.py @@ -960,12 +960,16 @@ def parser_body(prototype, *fields, declarations=''): if not new_or_init: parser_code.append(normalize_snippet(""" %s = PyTuple_New(%s); + if (!%s) {{ + goto exit; + }} for (Py_ssize_t i = 0; i < %s; ++i) {{ PyTuple_SET_ITEM(%s, i, Py_NewRef(args[%d + i])); }} """ % ( p.converter.parser_name, left_args, + p.converter.parser_name, left_args, p.converter.parser_name, max_pos

1 0

GH-100192: add more `asyncio` subprocess tests (#100194)
by kumaraditya303 Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/e97afefda54b818b140b3cc905642b69d9… commit: e97afefda54b818b140b3cc905642b69d9d65f0c branch: main author: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> committer: kumaraditya303 <59607654+kumaraditya303(a)users.noreply.github.com> date: 2022-12-28T09:42:16+05:30 summary: GH-100192: add more `asyncio` subprocess tests (#100194) files: M Lib/test/test_asyncio/test_subprocess.py diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 3830dea7d9ba..1ae290a003f2 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -686,6 +686,88 @@ async def execute(): self.assertIsNone(self.loop.run_until_complete(execute())) + async def check_stdout_output(self, coro, output): + proc = await coro + stdout, _ = await proc.communicate() + self.assertEqual(stdout, output) + self.assertEqual(proc.returncode, 0) + task = asyncio.create_task(proc.wait()) + await asyncio.sleep(0) + self.assertEqual(task.result(), proc.returncode) + + def test_create_subprocess_env_shell(self) -> None: + async def main() -> None: + cmd = f'''{sys.executable} -c "import os, sys; sys.stdout.write(os.getenv('FOO'))"''' + env = {"FOO": 'bar'} + proc = await asyncio.create_subprocess_shell( + cmd, env=env, stdout=subprocess.PIPE + ) + return proc + + self.loop.run_until_complete(self.check_stdout_output(main(), b'bar')) + + def test_create_subprocess_env_exec(self) -> None: + async def main() -> None: + cmd = [sys.executable, "-c", + "import os, sys; sys.stdout.write(os.getenv('FOO'))"] + env = {"FOO": 'baz'} + proc = await asyncio.create_subprocess_exec( + *cmd, env=env, stdout=subprocess.PIPE + ) + return proc + + self.loop.run_until_complete(self.check_stdout_output(main(), b'baz')) + + + def test_subprocess_concurrent_wait(self) -> None: + async def main() -> None: + proc = await asyncio.create_subprocess_exec( + *PROGRAM_CAT, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + ) + stdout, _ = await proc.communicate(b'some data') + self.assertEqual(stdout, b"some data") + self.assertEqual(proc.returncode, 0) + self.assertEqual(await asyncio.gather(*[proc.wait() for _ in range(10)]), + [proc.returncode] * 10) + + self.loop.run_until_complete(main()) + + def test_subprocess_consistent_callbacks(self): + events = [] + class MyProtocol(asyncio.SubprocessProtocol): + def __init__(self, exit_future: asyncio.Future) -> None: + self.exit_future = exit_future + + def pipe_data_received(self, fd, data) -> None: + events.append(('pipe_data_received', fd, data)) + + def pipe_connection_lost(self, fd, exc) -> None: + events.append('pipe_connection_lost') + + def process_exited(self) -> None: + events.append('process_exited') + self.exit_future.set_result(True) + + async def main() -> None: + loop = asyncio.get_running_loop() + exit_future = asyncio.Future() + code = 'import sys; sys.stdout.write("stdout"); sys.stderr.write("stderr")' + transport, _ = await loop.subprocess_exec(lambda: MyProtocol(exit_future), + sys.executable, '-c', code, stdin=None) + await exit_future + transport.close() + self.assertEqual(events, [ + ('pipe_data_received', 1, b'stdout'), + ('pipe_data_received', 2, b'stderr'), + 'pipe_connection_lost', + 'pipe_connection_lost', + 'process_exited', + ]) + + self.loop.run_until_complete(main()) + def test_subprocess_communicate_stdout(self): # See https://github.com/python/cpython/issues/100133 async def get_command_stdout(cmd, *args):

1 0

gh-100553: Improve accuracy of sqlite3.Row iter test (GH-100555)
by miss-islington Dec. 28, 2022

Dec. 28, 2022

https://github.com/python/cpython/commit/fba8c7cf740433cc71280ea6dce6b44ee4… commit: fba8c7cf740433cc71280ea6dce6b44ee477b2d3 branch: 3.11 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2022-12-27T17:25:28-08:00 summary: gh-100553: Improve accuracy of sqlite3.Row iter test (GH-100555) (cherry picked from commit 3dc48dabd48864039951715816e07986a4828d80) Co-authored-by: Nikita Sobolev <mail(a)sobolevn.me> files: M Lib/test/test_sqlite3/test_factory.py diff --git a/Lib/test/test_sqlite3/test_factory.py b/Lib/test/test_sqlite3/test_factory.py index cdaf12588a7f..2b70093bd9b6 100644 --- a/Lib/test/test_sqlite3/test_factory.py +++ b/Lib/test/test_sqlite3/test_factory.py @@ -179,8 +179,14 @@ def test_sqlite_row_iter(self): """Checks if the row object is iterable""" self.con.row_factory = sqlite.Row row = self.con.execute("select 1 as a, 2 as b").fetchone() - for col in row: - pass + + # Is iterable in correct order and produces valid results: + items = [col for col in row] + self.assertEqual(items, [1, 2]) + + # Is iterable the second time: + items = [col for col in row] + self.assertEqual(items, [1, 2]) def test_sqlite_row_as_tuple(self): """Checks if the row object can be converted to a tuple"""

1 0