summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZdenek Dohnal <zdohnal@redhat.com>2021-10-06 19:39:16 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-06 19:39:16 +0100
commitedd7a476fbcba199dc0b026461917912c574c629 (patch)
tree0a1ac57ffc8635d9ff9230e3c0738235e3ab9b04
parente275ba4fc994474155fbafe8b87a6d3b477456ba (diff)
patch 8.2.3485: Python 3 test fails with Python 3.10v8.2.3485
Problem: Python 3 test fails with Python 3.10. Solution: Adjust expected error message. (zdohnal Dohnal, closes #8969)
-rw-r--r--src/testdir/test_python3.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 66d5db57fe..ed053094f8 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -12,7 +12,7 @@ func Create_vim_dict()
return {'a': 1}
endfunction
-let s:system_error_pat = 'Vim(py3):SystemError: \(<built-in function eval> returned NULL without setting an error\|error return without exception set\)'
+let s:system_error_pat = 'Vim(py3):SystemError: \(<built-in function eval> returned NULL without setting an \(error\|exception\)\|error return without exception set\)'
" This function should be called first. This sets up python functions used by
" the other tests.
diff --git a/src/version.c b/src/version.c
index 62c7f8f111..987f6ffc7d 100644
--- 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 */
/**/
+ 3485,
+/**/
3484,
/**/
3483,