patch 8.1.1346: error for Python exception does not show useful info
Problem: Error for Python exception does not show useful info.
Solution: Show the last line instead of the first one. (Ben Jackson,
closes #4381)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 4e1a42a..cc0450c 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -412,6 +412,8 @@
Py_BEGIN_ALLOW_THREADS
Python_Lock_Vim();
+ if (error)
+ emsg_severe = TRUE;
writer((writefn)(error ? emsg : msg), (char_u *)str, len);
Python_Release_Vim();
Py_END_ALLOW_THREADS
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 24d3fd4..6ad02e3 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -91,7 +91,7 @@
0.0
"\0": Vim(let):E859:
{"\0": 1}: Vim(let):E859:
-undefined_name: Vim(let):Trace
+undefined_name: Vim(let):NameE
vim: Vim(let):E859:
[1]
[1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index a7d4f64..7ddea8f 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -91,7 +91,7 @@
0.0
"\0": Vim(let):E859:
{"\0": 1}: Vim(let):E859:
-undefined_name: Vim(let):Trace
+undefined_name: Vim(let):NameE
vim: Vim(let):E859:
[1]
[1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim
index 632f7a8..5703231 100644
--- a/src/testdir/test_python2.vim
+++ b/src/testdir/test_python2.vim
@@ -160,3 +160,11 @@
bwipe!
endfunction
+
+func Test_Catch_Exception_Message()
+ try
+ py raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 514661e..aacc5a5 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -160,3 +160,11 @@
bwipe!
endfunction
+
+func Test_Catch_Exception_Message()
+ try
+ py3 raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/testdir/test_pyx2.vim b/src/testdir/test_pyx2.vim
index 50e57c3..baaf7fa 100644
--- a/src/testdir/test_pyx2.vim
+++ b/src/testdir/test_pyx2.vim
@@ -72,3 +72,11 @@
call assert_match(s:py3pattern, split(var)[0])
endif
endfunc
+
+func Test_Catch_Exception_Message()
+ try
+ pyx raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/testdir/test_pyx3.vim b/src/testdir/test_pyx3.vim
index 64546b4..4b6057a 100644
--- a/src/testdir/test_pyx3.vim
+++ b/src/testdir/test_pyx3.vim
@@ -72,3 +72,11 @@
call assert_match(s:py2pattern, split(var)[0])
endif
endfunc
+
+func Test_Catch_Exception_Message()
+ try
+ pyx raise RuntimeError( 'TEST' )
+ catch /.*/
+ call assert_match( '^Vim(.*):RuntimeError: TEST$', v:exception )
+ endtry
+endfunc
diff --git a/src/version.c b/src/version.c
index 5194276..fc1a5d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1346,
+/**/
1345,
/**/
1344,