From 06ef941d951e5a25f6a4acbacee286a7e97c1af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 6 Jan 2023 15:37:38 +0100
Subject: [PATCH] Fix `asyncio` subprocess losing `stderr` and `stdout` output

Reported as a regression in https://bodhi.fedoraproject.org/updates/FEDORA-2022-dbb811d203
---
 ...cess-losing-stderr-and-stdout-output.patch | 66 +++++++++++++++++++
 python3.11.spec                               |  9 ++-
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch

diff --git a/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch b/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch
new file mode 100644
index 0000000..c480127
--- /dev/null
+++ b/00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Miss Islington (bot)"
+ <31488909+miss-islington@users.noreply.github.com>
+Date: Wed, 21 Dec 2022 02:24:19 -0800
+Subject: [PATCH] 00395: GH-100133: fix `asyncio` subprocess losing `stderr`
+ and `stdout` output
+
+(cherry picked from commit a7715ccfba5b86ab09f86ec56ac3755c93b46b48)
+
+Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
+---
+ Lib/asyncio/base_subprocess.py                  |  3 ---
+ Lib/test/test_asyncio/test_subprocess.py        | 17 +++++++++++++++++
+ ...22-12-10-08-36-07.gh-issue-100133.g-zQlp.rst |  1 +
+ 3 files changed, 18 insertions(+), 3 deletions(-)
+ create mode 100644 Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst
+
+diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py
+index e15bb4141f..4c9b0dd565 100644
+--- a/Lib/asyncio/base_subprocess.py
++++ b/Lib/asyncio/base_subprocess.py
+@@ -215,9 +215,6 @@ def _process_exited(self, returncode):
+             # object. On Python 3.6, it is required to avoid a ResourceWarning.
+             self._proc.returncode = returncode
+         self._call(self._protocol.process_exited)
+-        for p in self._pipes.values():
+-            if p is not None:
+-                p.pipe.close()
+ 
+         self._try_finish()
+ 
+diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
+index f71ad72f99..bea2314a52 100644
+--- a/Lib/test/test_asyncio/test_subprocess.py
++++ b/Lib/test/test_asyncio/test_subprocess.py
+@@ -684,6 +684,23 @@ async def execute():
+ 
+         self.assertIsNone(self.loop.run_until_complete(execute()))
+ 
++    def test_subprocess_communicate_stdout(self):
++        # See https://github.com/python/cpython/issues/100133
++        async def get_command_stdout(cmd, *args):
++            proc = await asyncio.create_subprocess_exec(
++                cmd, *args, stdout=asyncio.subprocess.PIPE,
++            )
++            stdout, _ = await proc.communicate()
++            return stdout.decode().strip()
++
++        async def main():
++            outputs = [f'foo{i}' for i in range(10)]
++            res = await asyncio.gather(*[get_command_stdout(sys.executable, '-c',
++                                        f'print({out!r})') for out in outputs])
++            self.assertEqual(res, outputs)
++
++        self.loop.run_until_complete(main())
++
+ 
+ if sys.platform != 'win32':
+     # Unix
+diff --git a/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst b/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst
+new file mode 100644
+index 0000000000..881e6ed80f
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2022-12-10-08-36-07.gh-issue-100133.g-zQlp.rst
+@@ -0,0 +1 @@
++Fix regression in :mod:`asyncio` where a subprocess would sometimes lose data received from pipe.
diff --git a/python3.11.spec b/python3.11.spec
index 5fac9d8..3c01a3b 100644
--- a/python3.11.spec
+++ b/python3.11.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python-2.0.1
 
 
@@ -315,6 +315,10 @@ Patch251: 00251-change-user-install-location.patch
 # https://github.com/GrahamDumpleton/mod_wsgi/issues/730
 Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch
 
+# 00395 # 18ff37a92c507144edf32274b356dd1dd734cf07
+# GH-100133: fix `asyncio` subprocess losing `stderr` and `stdout` output
+Patch395: 00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch
+
 # (New patches go here ^^^)
 #
 # When adding new patches to "python" and "python3" in Fedora, EL, etc.,
@@ -1597,6 +1601,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Fri Jan 06 2023 Miro Hrončok <mhroncok@redhat.com> - 3.11.1-3
+- Fix `asyncio` subprocess losing `stderr` and `stdout` output
+
 * Mon Dec 19 2022 Miro Hrončok <mhroncok@redhat.com> - 3.11.1-2
 - No longer patch the default bytecode cache invalidation policy