From 0ea351a72783107c6869a0cd9badf287b0a36538 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Sun, 6 Aug 2023 16:12:19 +0100 Subject: [PATCH 1/2] Remove unused variables from `Tools/clinic` and tests for `Tools/clinic` --- Lib/test/test_clinic.py | 11 ++++------- Tools/clinic/cpp.py | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py index d13d8623f8093b..e3ffe08992c470 100644 --- a/Lib/test/test_clinic.py +++ b/Lib/test/test_clinic.py @@ -557,7 +557,6 @@ def test_directive_preserve_input(self): self.expect_failure(block, err, lineno=6) def test_directive_preserve_output(self): - err = "'preserve' only works for blocks that don't produce any output!" block = dedent(""" /*[clinic input] output everything buffer @@ -895,8 +894,9 @@ def test_param_no_docstring(self): follow_symlinks: bool = True something_else: str = '' """) - p = function.parameters['follow_symlinks'] self.assertEqual(3, len(function.parameters)) + p = function.parameters['follow_symlinks'] + self.assertIsInstance(p, clinic.bool_converter) conv = function.parameters['something_else'].converter self.assertIsInstance(conv, clinic.str_converter) @@ -1849,10 +1849,6 @@ def test_scaffolding(self): self.assertEqual(repr(clinic.NULL), '') # test that fail fails - expected = ( - 'Error in file "clown.txt" on line 69:\n' - 'The igloos are melting!\n' - ) with support.captured_stdout() as stdout: errmsg = 'The igloos are melting' with self.assertRaisesRegex(clinic.ClinicError, errmsg) as cm: @@ -1860,6 +1856,7 @@ def test_scaffolding(self): exc = cm.exception self.assertEqual(exc.filename, 'clown.txt') self.assertEqual(exc.lineno, 69) + self.assertEqual(stdout.getvalue(), "") def test_non_ascii_character_in_docstring(self): block = """ @@ -2299,7 +2296,7 @@ def test_file_dest(self): "not overwriting!") self.assertIn(expected_err, err) # Run clinic again, this time with the -f option. - out = self.expect_success("-f", in_fn) + _ = self.expect_success("-f", in_fn) # Read back the generated output. with open(in_fn, encoding="utf-8") as f: data = f.read() diff --git a/Tools/clinic/cpp.py b/Tools/clinic/cpp.py index 3d9c61ac678965..16eee6fc399491 100644 --- a/Tools/clinic/cpp.py +++ b/Tools/clinic/cpp.py @@ -186,7 +186,7 @@ def _main(filenames: list[str] | None = None) -> None: cpp = Monitor(filename, verbose=True) print() print(filename) - for line_number, line in enumerate(f.read().split('\n'), 1): + for line in f: cpp.writeline(line) From ace4cc91c33c5144c6e4714830be9a9dcd356b66 Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Tue, 8 Aug 2023 14:51:53 +0100 Subject: [PATCH 2/2] fix --- Lib/test/test_clinic.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py index e3ffe08992c470..918595effa8718 100644 --- a/Lib/test/test_clinic.py +++ b/Lib/test/test_clinic.py @@ -895,8 +895,6 @@ def test_param_no_docstring(self): something_else: str = '' """) self.assertEqual(3, len(function.parameters)) - p = function.parameters['follow_symlinks'] - self.assertIsInstance(p, clinic.bool_converter) conv = function.parameters['something_else'].converter self.assertIsInstance(conv, clinic.str_converter)