diff options
author | Victor Stinner <vstinner@python.org> | 2021-10-13 03:24:33 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 03:24:33 (GMT) |
commit | 678433f25e0d08dad7edf72be8f0cf9420e4ed2c (patch) | |
tree | d57da766339c736ece93e411c315da866008bd94 | |
parent | c63623a0a6892ce8683dbf8c769793ea897e6ba8 (diff) | |
download | cpython-678433f25e0d08dad7edf72be8f0cf9420e4ed2c.zip cpython-678433f25e0d08dad7edf72be8f0cf9420e4ed2c.tar.gz cpython-678433f25e0d08dad7edf72be8f0cf9420e4ed2c.tar.bz2 |
bpo-45453: Fix test_embed.StdPrinterTests (GH-28916)
test_embed.StdPrinterTests now always use the file descriptor 1 for
stdout, rather than using sys.__stdout__.fileno().
PyFile_NewStdPrinter() does crash if the argument is not 1 or 2.
Fix also a few pyflakes warnings: remove unused import and variables.
-rw-r--r-- | Lib/test/test_embed.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index c748000..31c5c3e 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -13,7 +13,6 @@ import re import shutil import subprocess import sys -import sysconfig import tempfile import textwrap @@ -592,7 +591,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): def get_expected_config(self, expected_preconfig, expected, expected_pathconfig, env, api, modify_path_cb=None): - cls = self.__class__ configs = self._get_expected_config() pre_config = configs['pre_config'] @@ -1248,7 +1246,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): self.fail(f"Unable to find home in {paths!r}") prefix = exec_prefix = home - ver = sys.version_info expected_paths = self.module_search_paths(prefix=home, exec_prefix=home) config = { @@ -1549,8 +1546,7 @@ class StdPrinterTests(EmbeddingTestsMixin, unittest.TestCase): # "Set up a preliminary stderr printer until we have enough # infrastructure for the io module in place." - def get_stdout_fd(self): - return sys.__stdout__.fileno() + STDOUT_FD = 1 def create_printer(self, fd): ctypes = import_helper.import_module('ctypes') @@ -1562,7 +1558,7 @@ class StdPrinterTests(EmbeddingTestsMixin, unittest.TestCase): def test_write(self): message = "unicode:\xe9-\u20ac-\udc80!\n" - stdout_fd = self.get_stdout_fd() + stdout_fd = self.STDOUT_FD stdout_fd_copy = os.dup(stdout_fd) self.addCleanup(os.close, stdout_fd_copy) @@ -1583,7 +1579,7 @@ class StdPrinterTests(EmbeddingTestsMixin, unittest.TestCase): self.assertEqual(data, message.encode('utf8', 'backslashreplace')) def test_methods(self): - fd = self.get_stdout_fd() + fd = self.STDOUT_FD printer = self.create_printer(fd) self.assertEqual(printer.fileno(), fd) self.assertEqual(printer.isatty(), os.isatty(fd)) @@ -1591,7 +1587,7 @@ class StdPrinterTests(EmbeddingTestsMixin, unittest.TestCase): printer.close() # noop def test_disallow_instantiation(self): - fd = self.get_stdout_fd() + fd = self.STDOUT_FD printer = self.create_printer(fd) support.check_disallow_instantiation(self, type(printer)) |