mirror of
https://github.com/vim/vim.git
synced 2025-11-14 23:04:02 -05:00
patch 9.1.1869: tests: test failures with Python 3.14 and test_python3
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: #18629 Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
0124320c97
commit
6cb995970e
@@ -28,6 +28,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)
|
||||
@@ -64,6 +65,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:
|
||||
|
||||
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1869,
|
||||
/**/
|
||||
1868,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user