From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 6 Oct 2021 18:39:16 +0000 (+0100)
Subject: patch 8.2.3485: Python 3 test fails with Python 3.10
X-Git-Tag: v8.2.3485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edd7a476fbcba199dc0b026461917912c574c629;p=vim

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 #8969)
---

diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 66d5db57f..ed053094f 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 62c7f8f11..987f6ffc7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3485,
 /**/
     3484,
 /**/