patch 9.1.0844: if_python: no way to pass local vars to python
Problem: if_python: no way to pass local vars to python
Solution: Add locals argument to py3eval(), pyeval() and pyxeval()
(Ben Jackson)
fixes: #8573
closes: #10594
Signed-off-by: Ben Jackson <puremourning@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 3178cff..5e2b555 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -1027,6 +1027,52 @@
call AssertException(['let v = py3eval("vim")'], 'E859:')
endfunc
+" Test for py3eval with locals
+func Test_python3_pyeval_locals()
+ let str = 'a string'
+ let num = 0xbadb33f
+ let d = {'a': 1, 'b': 2, 'c': str}
+ let l = [ str, num, d ]
+
+ let locals = #{
+ \ s: str,
+ \ n: num,
+ \ d: d,
+ \ l: l,
+ \ }
+
+ " check basics
+ call assert_equal('a string', py3eval('s', locals))
+ call assert_equal(0xbadb33f, py3eval('n', locals))
+ call assert_equal(d, py3eval('d', locals))
+ call assert_equal(l, py3eval('l', locals))
+ call assert_equal('a,b,c', py3eval('b",".join(l)', {'l': ['a', 'b', 'c']}))
+ call assert_equal('hello', 's'->py3eval({'s': 'hello'}))
+ call assert_equal('a,b,c', 'b",".join(l)'->py3eval({'l': ['a', 'b', 'c']}))
+
+ py3 << trim EOF
+ def __UpdateDict(d, upd):
+ d.update(upd)
+ return d
+
+ def __ExtendList(l, *args):
+ l.extend(*args)
+ return l
+ EOF
+
+ " check assign to dict member works like bindeval
+ call assert_equal(3, py3eval('__UpdateDict( d, {"c": 3} )["c"]', locals))
+ call assert_equal(3, d['c'])
+
+ " check append lo list
+ call assert_equal(4, py3eval('len(__ExtendList(l, ["new item"]))', locals))
+ call assert_equal("new item", l[-1])
+
+ " check calling a function
+ let StrLen = function('strlen')
+ call assert_equal(3, py3eval('f("abc")', {'f': StrLen}))
+endfunc
+
" Test for vim.bindeval()
func Test_python3_vim_bindeval()
" Float