# HG changeset patch # User Bram Moolenaar # Date 1633545903 -7200 # Node ID eb6e4f0ba31d88cf0ffea2b97b2183e8fb4b0a9e # Parent 10ad4bc93d66a25462544fa7335b1f1054d153dc patch 8.2.3485: Python 3 test fails with Python 3.10 Commit: https://github.com/vim/vim/commit/edd7a476fbcba199dc0b026461917912c574c629 Author: Zdenek Dohnal Date: Wed Oct 6 19:39:16 2021 +0100 patch 8.2.3485: Python 3 test fails with Python 3.10 Problem: Python 3 test fails with Python 3.10. Solution: Adjust expected error message. (zdohnal Dohnal, closes https://github.com/vim/vim/issues/8969) diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim --- 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: \( returned NULL without setting an error\|error return without exception set\)' +let s:system_error_pat = 'Vim(py3):SystemError: \( 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 --- 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,