From 737dd83d1fca0387a0cc919eb848b548be8ddec8 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 25 Oct 2025 08:02:41 +0800 Subject: [PATCH] vim-patch:9.1.1869: tests: test failures with Python 3.14 and test_python3 (#36310) Problem: tests: test failures with Python 3.14 and test_python3 Solution: Adjust the expected error message (Yee Cheng Chin) Python 3.14 changed the error message from "argument must be 2-item sequence" to "argument must be 2-item tuple". Fix test to account for that. Otherwise the error message for the `vim.current.window.cursor = True` line would not match. closes: vim/vim#18629 https://github.com/vim/vim/commit/6cb995970eeb01453b3ef93ffb141d515950e9d7 Co-authored-by: Yee Cheng Chin --- test/old/testdir/test_python3.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/old/testdir/test_python3.vim b/test/old/testdir/test_python3.vim index 439dbf2ea8..558c9f2770 100644 --- a/test/old/testdir/test_python3.vim +++ b/test/old/testdir/test_python3.vim @@ -15,6 +15,7 @@ func Test_AAA_python3_setup() py37_exception_repr = re.compile(r'([^\(\),])(\)+)$') py39_type_error_pattern = re.compile(r'\w+\.([^(]+\(\) takes)') py310_type_error_pattern = re.compile(r'takes (\d+) positional argument but (\d+) were given') + py314_type_error_tuple_pattern = re.compile(r'must be (\d+)-item tuple') def emsg(ei): return ei[0].__name__ + ':' + repr(ei[1].args) @@ -51,6 +52,8 @@ func Test_AAA_python3_setup() # Python 3.9 reports errors like "vim.command() takes ..." instead of "command() takes ..." msg = py39_type_error_pattern.sub(r'\1', msg) msg = py310_type_error_pattern.sub(r'takes exactly \1 positional argument (\2 given)', msg) + # Python 3.14 has specific error messages for Tuple's + msg = py314_type_error_tuple_pattern.sub(r'must be \1-item sequence', msg) elif sys.version_info >= (3, 5) and e.__class__ is ValueError and str(e) == 'embedded null byte': msg = repr((TypeError, TypeError('expected bytes with no null'))) else: