mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-04 01:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1869: tests: test failures with Python 3.14 and test_python3 (#36310)

Browse Source 
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

6cb995970e

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>
This commit is contained in:
zeertzjq
2025-10-25 08:02:41 +08:00
committed by GitHub
parent 520568f40f
commit 737dd83d1f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/old/testdir/test_python3.vim
View File

@@ -15,6 +15,7 @@ func Test_AAA_python3_setup()
py37_exception_repr = re.compile(r'([^\(\),])(\)+)$') py37_exception_repr = re.compile(r'([^\(\),])(\)+)$')
py39_type_error_pattern = re.compile(r'\w+\.([^(]+\(\) takes)') py39_type_error_pattern = re.compile(r'\w+\.([^(]+\(\) takes)')
py310_type_error_pattern = re.compile(r'takes (\d+) positional argument but (\d+) were given') 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): def emsg(ei):
return ei[0].__name__ + ':' + repr(ei[1].args) 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 ..." # Python 3.9 reports errors like "vim.command() takes ..." instead of "command() takes ..."
msg = py39_type_error_pattern.sub(r'\1', msg) msg = py39_type_error_pattern.sub(r'\1', msg)
msg = py310_type_error_pattern.sub(r'takes exactly \1 positional argument (\2 given)', 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': 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'))) msg = repr((TypeError, TypeError('expected bytes with no null')))
else: else: