changeset 26139:97b4e8c55c1d v8.2.3602

patch 8.2.3602: Python3 test fails with Python 3.10 on MS-Windows Commit: https://github.com/vim/vim/commit/1be7e215830d6ec9aa6200aac4ef34ac0ae85af5 Author: K.Takata <kentkt@csc.jp> Date: Tue Nov 16 13:08:56 2021 +0000 patch 8.2.3602: Python3 test fails with Python 3.10 on MS-Windows Problem: Python3 test fails with Python 3.10 on MS-Windows. Solution: Adjust the expected error. (Ken Takata, closes https://github.com/vim/vim/issues/9118)
author Bram Moolenaar <Bram@vim.org>
date Tue, 16 Nov 2021 14:15:03 +0100
parents b19a063a7a74
children d48953225f7e
files src/testdir/test_python3.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -25,6 +25,7 @@ func Test_AAA_python3_setup()
     py33_type_error_pattern = re.compile('^__call__\(\) takes (\d+) positional argument but (\d+) were given$')
     py37_exception_repr = re.compile(r'([^\(\),])(\)+)$')
     py39_type_error_pattern = re.compile('\w+\.([^(]+\(\) takes)')
+    py310_type_error_pattern = re.compile('takes (\d+) positional argument but (\d+) were given')
 
     def emsg(ei):
       return ei[0].__name__ + ':' + repr(ei[1].args)
@@ -60,6 +61,7 @@ func Test_AAA_python3_setup()
                             msg = msg.replace(newmsg2, oldmsg2)
                         # 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)
                 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:
@@ -2639,6 +2641,7 @@ func Test_python3_errors()
   py3 cb = vim.current.buffer
 
   py3 << trim EOF
+    import os
     d = vim.Dictionary()
     ned = vim.Dictionary(foo='bar', baz='abcD')
     dl = vim.Dictionary(a=1)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3602,
+/**/
     3601,
 /**/
     3600,