From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sun, 20 May 2018 18:22:50 +0000 (-0700) Subject: [3.7] bpo-32262: Fix typo in f-string (GH-7016) X-Git-Tag: v3.7.0b5~72 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b85115ed4c5d4e80ab818b44401e71299de9e9a5;p=thirdparty%2FPython%2Fcpython.git [3.7] bpo-32262: Fix typo in f-string (GH-7016) Fix typo from commit 6370f345e1d5829e1fba59cd695c8b82c5a8c620 (cherry picked from commit d361e99868a9eaa7ffce9341e1207705dbb66b50) Co-authored-by: Christian Heimes --- diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py index 7c17066f8bb2..b547c444ad5d 100644 --- a/Lib/asyncio/base_subprocess.py +++ b/Lib/asyncio/base_subprocess.py @@ -57,7 +57,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport): if self._closed: info.append('closed') if self._pid is not None: - info.append(f'pid={self.pid}') + info.append(f'pid={self._pid}') if self._returncode is not None: info.append(f'returncode={self._returncode}') elif self._pid is not None: diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 81b08d6c292a..428510f77161 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -29,6 +29,7 @@ class TestSubprocessTransport(base_subprocess.BaseSubprocessTransport): self._proc.stdin = None self._proc.stdout = None self._proc.stderr = None + self._proc.pid = -1 class SubprocessTransportTests(test_utils.TestCase): @@ -73,6 +74,29 @@ class SubprocessTransportTests(test_utils.TestCase): transport.close() + def test_subprocess_repr(self): + waiter = asyncio.Future(loop=self.loop) + transport, protocol = self.create_transport(waiter) + transport._process_exited(6) + self.loop.run_until_complete(waiter) + + self.assertEqual( + repr(transport), + "" + ) + transport._returncode = None + self.assertEqual( + repr(transport), + "" + ) + transport._pid = None + transport._returncode = None + self.assertEqual( + repr(transport), + "" + ) + transport.close() + class SubprocessMixin: